Re: [GIT] Networking

From	David Miller <davem@davemloft.net>
Newsgroups	linux.kernel
Subject	Re: [GIT] Networking
Date	2016-10-06 02:30 +0200
Message-ID	<sp4Jr-Xg-1@gated-at.bofh.it> (permalink)
References	<sp30Z-8gt-3@gated-at.bofh.it> <sp30Z-8gt-1@gated-at.bofh.it> <sp4zL-TL-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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.

Thread

Re: [GIT] Networking Linus Torvalds <torvalds@linux-foundation.org> - 2016-10-06 00:40 +0200
  Re: [GIT] Networking Pablo Neira Ayuso <pablo@netfilter.org> - 2016-10-06 02:20 +0200
    Re: [GIT] Networking David Miller <davem@davemloft.net> - 2016-10-06 02:30 +0200
  Re: [GIT] Networking Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-06 03:00 +0200
    Re: [GIT] Networking Linus Torvalds <torvalds@linux-foundation.org> - 2016-10-06 04:20 +0200
      Re: [GIT] Networking David Miller <davem@davemloft.net> - 2016-10-06 05:00 +0200
        Re: [GIT] Networking Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-06 07:10 +0200
      Re: [GIT] Networking Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-06 05:00 +0200

csiph-web