From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Pablo Neira Ayuso <pablo@netfilter.org>,
NetFilter <netfilter-devel@vger.kernel.org>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Liping Zhang <liping.zhang@spreadtrum.com>
Subject: Re: linux-next: manual merge of the netfilter-next tree with the net tree
Date: Thu, 29 Sep 2016 11:20:14 +1000 [thread overview]
Message-ID: <20160929112014.4293728d@canb.auug.org.au> (raw)
In-Reply-To: <20160913101250.0ffee30f@canb.auug.org.au>
Hi all,
On Tue, 13 Sep 2016 10:12:50 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the netfilter-next tree got a conflict in:
>
> net/netfilter/nf_tables_netdev.c
>
> between commit:
>
> c73c24849011 ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment")
>
> from the net tree and commit:
>
> ddc8b6027ad0 ("netfilter: introduce nft_set_pktinfo_{ipv4, ipv6}_validate()")
>
> from the netfilter-next tree.
>
> I fixed it up (I used the latter version of this file and applied the
> patch 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.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 13 Sep 2016 10:08:58 +1000
> Subject: [PATCH] netfilter: merge fixup for "nf_tables_netdev: remove
> redundant ip_hdr assignment"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> include/net/netfilter/nf_tables_ipv4.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/include/net/netfilter/nf_tables_ipv4.h b/include/net/netfilter/nf_tables_ipv4.h
> index 968f00b82fb5..25e33aee91e7 100644
> --- a/include/net/netfilter/nf_tables_ipv4.h
> +++ b/include/net/netfilter/nf_tables_ipv4.h
> @@ -33,7 +33,6 @@ __nft_set_pktinfo_ipv4_validate(struct nft_pktinfo *pkt,
> if (!iph)
> return -1;
>
> - iph = ip_hdr(skb);
> if (iph->ihl < 5 || iph->version != 4)
> return -1;
>
> --
> 2.8.1
The above merge fix patch is now needed when the net-next tree is
merged with Linus' tree.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2016-09-29 1:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-13 0:12 linux-next: manual merge of the netfilter-next tree with the net tree Stephen Rothwell
2016-09-29 1:20 ` Stephen Rothwell [this message]
2018-07-18 1:28 Stephen Rothwell
2021-05-18 23:56 Stephen Rothwell
2021-05-19 4:05 ` Stephen Rothwell
2021-05-20 23:12 ` Stephen Rothwell
2021-05-20 23:40 ` Stefano Brivio
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=20160929112014.4293728d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=liping.zhang@spreadtrum.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).