Hi all,
Today's linux-next merge of the tty tree got conflicts in:
arch/powerpc/platforms/8xx/mpc885ads_setup.c
arch/powerpc/platforms/8xx/tqm8xx_setup.c
between commit:
33deffc9f19f ("net: fs_enet: Don't include fs_enet_pd.h when not needed")
from the net-next tree and commit:
a833b201d908 ("serial: cpm_uart: Don't include fs_uart_pd.h when not needed")
from the tty tree.
I fixed it up (see below) 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
diff --cc arch/powerpc/platforms/8xx/mpc885ads_setup.c
index c7c4f082b838,6ecc7fa2a816..000000000000
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@@ -21,7 -21,7 +21,6 @@@
#include <linux/device.h>
#include <linux/delay.h>
- #include <linux/fs_uart_pd.h>
-#include <linux/fs_enet_pd.h>
#include <linux/fsl_devices.h>
#include <linux/mii.h>
#include <linux/of_address.h>
diff --cc arch/powerpc/platforms/8xx/tqm8xx_setup.c
index 6e56be852b2c,a451f5003abd..000000000000
--- a/arch/powerpc/platforms/8xx/tqm8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
@@@ -24,7 -24,7 +24,6 @@@
#include <linux/device.h>
#include <linux/delay.h>
- #include <linux/fs_uart_pd.h>
-#include <linux/fs_enet_pd.h>
#include <linux/fsl_devices.h>
#include <linux/mii.h>
#include <linux/of_fdt.h>
Attachment:
pgpJIcfIwrWvG.pgp
Description: OpenPGP digital signature
