From: David Miller <davem@davemloft.net>
To: pablo@netfilter.org
Cc: torvalds@linux-foundation.org, sfr@canb.auug.org.au,
netfilter-devel@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, liping.zhang@spreadtrum.com
Subject: Re: [GIT] Networking
Date: Wed, 05 Oct 2016 20:26:24 -0400 (EDT) [thread overview]
Message-ID: <20161005.202624.1436239748210168011.davem@davemloft.net> (raw)
In-Reply-To: <20161006000945.GA18976@salvia>
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 6 Oct 2016 02:09:45 +0200
> On Wed, Oct 05, 2016 at 03:37:17PM -0700, Linus Torvalds wrote:
>> On Wed, Oct 5, 2016 at 3:29 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > I have been carrying the following merge fix patch (for the merge of
>> > the net-next tree with Linus' tree) for a while now which seems to have
>> > got missed:
>>
>> Ugh. It doesn't seem to be a merge error, because that double iph
>> assignment came from the original patch that introduced this function:
>> commit ddc8b6027ad0 ("netfilter: introduce nft_set_pktinfo_{ipv4,
>> ipv6}_validate()").
>>
>> So I wouldn't call it a merge error - it just looks like a bug in the
>> network layer. So I'm not going to apply your patch even though it
>> looks plausible to me, simply because it's outside my area of
>> expertise.
>>
>> David? Pablo?
>
> This looks good, please take it so we speed up things.
>
> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Applied.
next prev parent reply other threads:[~2016-10-06 0:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20161005.014437.1946431553783736769.davem@davemloft.net>
2016-10-05 22:29 ` [GIT] Networking Stephen Rothwell
2016-10-05 22:37 ` Linus Torvalds
2016-10-06 0:09 ` Pablo Neira Ayuso
2016-10-06 0:26 ` David Miller [this message]
2016-10-06 0:52 ` Stephen Rothwell
2016-10-06 2:14 ` Linus Torvalds
2016-10-06 2:51 ` Stephen Rothwell
2016-10-06 2:56 ` David Miller
2016-10-06 5:07 ` Stephen Rothwell
2013-11-11 20:47 David Miller
-- strict thread matches above, loose matches on Subject: below --
2011-03-16 21:21 David Miller
2011-01-12 0:24 David Miller
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=20161005.202624.1436239748210168011.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=liping.zhang@spreadtrum.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.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).