Re: linux-next: manual merge of the net-next tree with the powerpc tree

Hi all, On Fri, 18 Aug 2023 11:17:07 +1000 Stephen Rothwell 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 ") > > from the po

linux-next: manual merge of the net-next tree with the powerpc tree

Hi all, 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 ") from the powerpc tree and commit: 7a76918371fe ("net: fs_enet: Move struct fs_platform_in

Re: linux-next: manual merge of the net-next tree with the powerpc tree

Hi all, On Fri, 6 Mar 2020 10:21:58 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the net-next tree got a conflict in: > > fs/sysfs/group.c > > between commit: > > 9255782f7061 ("sysfs: Wrap __compat_only_sysfs_link_entry_to_kobj function > to change the symlink name") >

linux-next: manual merge of the net-next tree with the powerpc tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: fs/sysfs/group.c between commit: 9255782f7061 ("sysfs: Wrap __compat_only_sysfs_link_entry_to_kobj function to change the symlink name") from the powerpc tree and commit: 303a42769c4c ("sysfs: add sysfs_group{s}_c

Re: linux-next: manual merge of the net-next tree with the powerpc tree

From: Stephen Rothwell Date: Fri, 9 Mar 2012 17:44:16 +1100 > On Thu, 08 Mar 2012 22:15:34 -0800 (PST) David Miller > wrote: >> >> From: Stephen Rothwell >> Date: Fri, 9 Mar 2012 13:36:46 +1100 >> >> > Today's linux-next merge of the net-next tree got a conflict in >> > drivers/net/ethernet/i

Re: linux-next: manual merge of the net-next tree with the powerpc tree

Hi Dave, On Thu, 08 Mar 2012 22:15:34 -0800 (PST) David Miller wrote: > > From: Stephen Rothwell > Date: Fri, 9 Mar 2012 13:36:46 +1100 > > > Today's linux-next merge of the net-next tree got a conflict in > > drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6 > > ("net: power

Re: linux-next: manual merge of the net-next tree with the powerpc tree

From: Stephen Rothwell Date: Fri, 9 Mar 2012 13:36:46 +1100 > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6 > ("net: powerpc: remove the legacy iSeries ethernet driver") from the > powerpc tree and commit 41de

linux-next: manual merge of the net-next tree with the powerpc tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6 ("net: powerpc: remove the legacy iSeries ethernet driver") from the powerpc tree and commit 41de8d4cff21 ("drivers/net: Remove alloc_etherdev error messages"