From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934773AbcJFA0d (ORCPT ); Wed, 5 Oct 2016 20:26:33 -0400 Received: from shards.monkeyblade.net ([184.105.139.130]:50872 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752840AbcJFA0b (ORCPT ); Wed, 5 Oct 2016 20:26:31 -0400 Date: Wed, 05 Oct 2016 20:26:24 -0400 (EDT) Message-Id: <20161005.202624.1436239748210168011.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 From: David Miller In-Reply-To: <20161006000945.GA18976@salvia> References: <20161006092947.25ae781c@canb.auug.org.au> <20161006000945.GA18976@salvia> X-Mailer: Mew version 6.7 on Emacs 24.5 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Wed, 05 Oct 2016 17:26:27 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pablo Neira Ayuso 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 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 Applied.