Messages in this thread | | | Date | Thu, 28 May 2015 14:17:16 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in drivers/net/phy/amd-xgbe-phy.c between commit 983942a5eaca ("amd-xgbe-phy: Fix initial mode when autoneg is disabled") from Linus' tree and commit 7c12aa08779c ("amd-xgbe: Move the PHY support into amd-xgbe") from the net-next tree.
I fixed it up (the latter removed the file, so I did that - there may be more needed) 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] | |