Messages in this thread |  | | Date | Wed, 05 Oct 2016 20:26:24 -0400 (EDT) | Subject | Re: [GIT] Networking | From | David Miller <> |
| |
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.
|  |