| Message ID | 20191021110745.3c7563a4@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with Linus' tree | expand |
diff --cc include/net/net_namespace.h index 4c2cd9378699,5ac2bb16d4b3..000000000000 --- a/include/net/net_namespace.h
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.