lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240904120221.54e6cfcb@canb.auug.org.au>
Date: Wed, 4 Sep 2024 12:02:21 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Daniel Borkmann <daniel@...earbox.net>, Alexei Starovoitov
 <ast@...nel.org>, Andrii Nakryiko <andrii@...nel.org>, David Miller
 <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni
 <pabeni@...hat.com>
Cc: bpf <bpf@...r.kernel.org>, Networking <netdev@...r.kernel.org>,
 Alexander Lobakin <aleksander.lobakin@...el.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Martin KaFai Lau <martin.lau@...nel.org>
Subject: linux-next: manual merge of the bpf-next tree with the net-next
 tree

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;

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ