Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/amd/xgbe/xgbe-main.c
between commit:
91eefaabf102 ("amd-xgbe: Fix unused suspend handlers build warning")
from the net tree and commit:
bd8255d8ba35 ("amd-xgbe: Prepare for supporting PCI devices")
from the net-next tree.
I fixed it up (the latter removed the code modified by the former)
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
