Message ID | 20230818111707.2714e8cb@canb.auug.org.au (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | linux-next: manual merge of the net-next tree with the powerpc tree | expand |
Hi all, On Fri, 18 Aug 2023 11:17:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/freescale/fs_enet/fs_enet.h > > between commit: > > 60bc069c433f ("powerpc/include: Remove unneeded #include <asm/fs_pd.h>") > > from the powerpc tree and commit: > > 7a76918371fe ("net: fs_enet: Move struct fs_platform_info into fs_enet.h") > > from the net-next 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 drivers/net/ethernet/freescale/fs_enet/fs_enet.h > index aad96cb2ab4e,d371072fff60..000000000000 > --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h > +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h > @@@ -9,8 -10,8 +10,6 @@@ > #include <linux/phy.h> > #include <linux/dma-mapping.h> > > - #include <linux/fs_enet_pd.h> > -#include <asm/fs_pd.h> > -- > #ifdef CONFIG_CPM1 > #include <asm/cpm1.h> > #endif This is now a conflict between the powerpc tree and Linus' tree.
diff --cc drivers/net/ethernet/freescale/fs_enet/fs_enet.h index aad96cb2ab4e,d371072fff60..000000000000 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h