Messages in this thread | | | Date | Tue, 8 Jan 2013 14:15:13 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drop-experimental tree with the net-next tree |
| |
Hi Kees,
Today's linux-next merge of the drop-experimental tree got conflicts in drivers/net/ethernet/8390/Kconfig and drivers/net/ethernet/i825xx/Kconfig between commits 483f777266f5 ("drivers/net: remove orphaned references to micro channel") from the net-next tree and commits 16f5471ff2da ("drivers/net/ethernet/8390: remove depends on CONFIG_EXPERIMENTAL") and 65af6f091e6d ("drivers/net/ethernet/i825xx: remove depends on CONFIG_EXPERIMENTAL") from the drop-experimental tree.
I fixed it up (I used the latter versions) 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] | |