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

[Stephen Rothwell]

Hi all,

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

  include/net/netfilter/nf_tables_core.h

between commit:

  e240cd0df481 ("netfilter: nf_tables: place all set backends in one single module")

from the net tree and commit:

  da8f7d227adc ("netfilter: nf_tables: handle meta/lookup with direct call")

from the netfilter-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 include/net/netfilter/nf_tables_core.h
index a05134507e7b,0096f65096b5..000000000000
--- a/include/net/netfilter/nf_tables_core.h
+++ b/include/net/netfilter/nf_tables_core.h
@@@ -65,10 -65,11 +65,17 @@@ extern const struct nft_expr_ops nft_pa
  extern struct static_key_false nft_counters_enabled;
  extern struct static_key_false nft_trace_enabled;
  
 +extern struct nft_set_type nft_set_rhash_type;
 +extern struct nft_set_type nft_set_hash_type;
 +extern struct nft_set_type nft_set_hash_fast_type;
 +extern struct nft_set_type nft_set_rbtree_type;
 +extern struct nft_set_type nft_set_bitmap_type;
 +
+ struct nft_expr;
+ struct nft_regs;
+ struct nft_pktinfo;
+ void nft_meta_get_eval(const struct nft_expr *expr,
+ 		       struct nft_regs *regs, const struct nft_pktinfo *pkt);
+ void nft_lookup_eval(const struct nft_expr *expr,
+ 		     struct nft_regs *regs, const struct nft_pktinfo *pkt);
  #endif /* _NET_NF_TABLES_CORE_H */

Attachment: pgp1QnaIvuof5.pgp
Description: OpenPGP digital signature