| Message ID | 20240904120221.54e6cfcb@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: manual merge of the bpf-next tree with the net-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 4 Sep 2024 12:02:21 +1000 > Hi all, > > Today's linux-next merge of the bpf-next tree got a conflict in: > > drivers/net/netkit.c > > between commit: > > 00d066a4d4ed ("netdev_features: convert NETIF_F_LLTX to dev->lltx") > > from the net-next tree and commit: > > d96608794889 ("netkit: Disable netpoll support") > > from the bpf-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. Your fix is technically correct, but maybe swap the lines? dev->priv_flags |= IFF_NO_QUEUE; + dev->priv_flags |= IFF_DISABLE_NETPOLL; + dev->lltx = true; Looks more natural I'd say... Thanks, Olek
On 9/4/24 3:16 PM, Alexander Lobakin wrote: > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Wed, 4 Sep 2024 12:02:21 +1000 > >> Hi all, >> >> Today's linux-next merge of the bpf-next tree got a conflict in: >> >> drivers/net/netkit.c >> >> between commit: >> >> 00d066a4d4ed ("netdev_features: convert NETIF_F_LLTX to dev->lltx") >> >> from the net-next tree and commit: >> >> d96608794889 ("netkit: Disable netpoll support") >> >> from the bpf-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. > > Your fix is technically correct, but maybe swap the lines? > > dev->priv_flags |= IFF_NO_QUEUE; > + dev->priv_flags |= IFF_DISABLE_NETPOLL; > + dev->lltx = true; > > Looks more natural I'd say... Yep, 100%, we'll use that as merge conflict resolution when flushing the next PR, thanks!
diff --cc drivers/net/netkit.c index 79232f5cc088,0681cf86284d..000000000000 --- a/drivers/net/netkit.c
Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: drivers/net/netkit.c between commit: 00d066a4d4ed ("netdev_features: convert NETIF_F_LLTX to dev->lltx") from the net-next tree and commit: d96608794889 ("netkit: Disable netpoll support") from the bpf-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.