Messages in this thread | | | Date | Tue, 8 Jan 2013 14:19:27 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drop-experimental tree with Linus' and the net-next trees |
| |
Hi Kees,
Today's linux-next merge of the drop-experimental tree got a conflict in drivers/net/ethernet/intel/Kconfig between commit c56283034ce2 ("pps, ptp: Remove dependencies on EXPERIMENTAL") from Linus' tree, commit 483f777266f5 ("drivers/net: remove orphaned references to micro channel") from the net-next tree and commit a9270b9a8436 ("drivers/net/ethernet/intel: remove depends on CONFIG_EXPERIMENTAL") from the drop-experimental tree.
I fixed it up and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |