From: Mark Brown <broonie@kernel•org>
To: Florian Westphal <fw@strlen•de>,
Pablo Neira Ayuso <pablo@netfilter•org>,
NetFilter <netfilter-devel@vger•kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the netfilter-next tree with the netfilter tree
Date: Thu, 24 May 2018 17:19:02 +0100 [thread overview]
Message-ID: <20180524161902.GZ4828@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1370 bytes --]
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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-05-24 16:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-24 16:19 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-15 2:00 linux-next: manual merge of the netfilter-next tree with the netfilter tree Stephen Rothwell
2021-10-18 23:13 ` Stephen Rothwell
2019-04-15 1:22 Stephen Rothwell
2019-04-16 1:26 ` Stephen Rothwell
2017-12-07 1:58 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180524161902.GZ4828@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=fw@strlen$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
--cc=pablo@netfilter$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox