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>] [day] [month] [year] [list]
Date:   Mon, 21 Oct 2019 11:07:45 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Eric Dumazet <edumazet@...gle.com>,
        Jiri Pirko <jiri@...lanox.com>
Subject: linux-next: manual merge of the net-next tree with Linus' tree

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  include/net/net_namespace.h

between commit:

  2a06b8982f8f ("net: reorder 'struct net' fields to avoid false sharing")

from Linus' tree and commit:

  a30c7b429f2d ("net: introduce per-netns netdevice notifiers")

from the net-next tree.

I fixed it up (see below - but it clearly needs more thought) 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 include/net/net_namespace.h
index 4c2cd9378699,5ac2bb16d4b3..000000000000
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@@ -102,14 -94,14 +103,15 @@@ struct net 
  
  	struct uevent_sock	*uevent_sock;		/* uevent socket */
  
 -	struct list_head 	dev_base_head;
  	struct hlist_head 	*dev_name_head;
  	struct hlist_head	*dev_index_head;
+ 	struct raw_notifier_head	netdev_chain;
 +	/* Note that @hash_mix can be read millions times per second,
 +	 * it is critical that it is on a read_mostly cache line.
 +	 */
 +	u32			hash_mix;
  
 -	unsigned int		dev_base_seq;	/* protected by rtnl_mutex */
 -	int			ifindex;
 -	unsigned int		dev_unreg_count;
 +	struct net_device       *loopback_dev;          /* The loopback */
  
  	/* core fib_rules */
  	struct list_head	rules_ops;

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists