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

[Mark Brown]

Hi all,

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

  net/netfilter/core.c

between commit:

  25fd386e0bc065849 ("netfilter: core: add missing __rcu annotation")

from the netfilter tree and commit:

  2c205dd3981f79cef ("netfilter: add struct nf_nat_hook and use it")

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.

diff --cc net/netfilter/core.c
index 206fb2c4c319,e0ae4aae96f5..000000000000
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@@ -580,13 -611,7 +611,8 @@@ const struct nf_conntrack_zone nf_ct_zo
  EXPORT_SYMBOL_GPL(nf_ct_zone_dflt);
  #endif /* CONFIG_NF_CONNTRACK */
  
- #ifdef CONFIG_NF_NAT_NEEDED
- void (*nf_nat_decode_session_hook)(struct sk_buff *, struct flowi *);
- EXPORT_SYMBOL(nf_nat_decode_session_hook);
- #endif
- 
 -static void __net_init __netfilter_net_init(struct nf_hook_entries **e, int max)
 +static void __net_init
 +__netfilter_net_init(struct nf_hook_entries __rcu **e, int max)
  {
  	int h;

Attachment: signature.asc
Description: PGP signature