Re: [GIT] Networking

From: Linus Torvalds
Date: Wed Oct 05 2016 - 18:37:31 EST

On Wed, Oct 5, 2016 at 3:29 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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,

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

David? Pablo?