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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/netkit.c
index 79232f5cc088,0681cf86284d..000000000000
--- a/drivers/net/netkit.c
+++ b/drivers/net/netkit.c
@@@ -255,7 -255,7 +255,8 @@@ static void netkit_setup(struct net_dev
  	dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
  	dev->priv_flags |= IFF_PHONY_HEADROOM;
  	dev->priv_flags |= IFF_NO_QUEUE;
 +	dev->lltx = true;
+ 	dev->priv_flags |= IFF_DISABLE_NETPOLL;
  
  	dev->ethtool_ops = &netkit_ethtool_ops;
  	dev->netdev_ops  = &netkit_netdev_ops;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]