Subject: linux-next: manual merge of the netfilter tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 10 May 2019 08:34:35 +1000

Hi all,

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

  include/uapi/linux/netfilter/nf_tables.h

between commit:

  3087c3f7c23b ("netfilter: nft_ct: Add ct id support")

from Linus' tree and commit:

  c6c9c0596c21 ("netfilter: nf_tables: remove NFT_CT_TIMEOUT")

from the netfilter 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 include/uapi/linux/netfilter/nf_tables.h
index f0cf7b0f4f35,92bb1e2b2425..000000000000
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@@ -966,8 -966,6 +966,7 @@@ enum nft_socket_keys 
   * @NFT_CT_DST_IP: conntrack layer 3 protocol destination (IPv4 address)
   * @NFT_CT_SRC_IP6: conntrack layer 3 protocol source (IPv6 address)
   * @NFT_CT_DST_IP6: conntrack layer 3 protocol destination (IPv6 address)
-  * @NFT_CT_TIMEOUT: connection tracking timeout policy assigned to conntrack
 + * @NFT_CT_ID: conntrack id
   */
  enum nft_ct_keys {
  	NFT_CT_STATE,
@@@ -993,8 -991,6 +992,7 @@@
  	NFT_CT_DST_IP,
  	NFT_CT_SRC_IP6,
  	NFT_CT_DST_IP6,
- 	NFT_CT_TIMEOUT,
 +	NFT_CT_ID,
  	__NFT_CT_MAX
  };
  #define NFT_CT_MAX		(__NFT_CT_MAX - 1)