From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: [GIT] Networking Date: Thu, 6 Oct 2016 13:51:52 +1100 Message-ID: <20161006135152.3fd229cb@canb.auug.org.au> References: <20161005.014437.1946431553783736769.davem@davemloft.net> <20161006092947.25ae781c@canb.auug.org.au> <20161006115235.1a89c0da@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: David Miller , NetFilter , Network Development , Linux Kernel Mailing List , Pablo Neira Ayuso , Liping Zhang To: Linus Torvalds Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-Id: netfilter-devel.vger.kernel.org Hi Linus, On Wed, 5 Oct 2016 19:14:21 -0700 Linus Torvalds wrote: > > On Wed, Oct 5, 2016 at 5:52 PM, Stephen Rothwell wrote: > > > > Except that commit effectively moved that function from > > net/netfilter/nf_tables_netdev.c to > > include/net/netfilter/nf_tables_ipv4.h while commit c73c24849011 > > ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment") > > removed the assignment in the original file (and has been in your tree > > since v4.8-rc7) and that is where I originally actually got a conflict. > > Oh, interesting. Why didn't I get the conflict there then? > > I'm guessing (but too lazy to actually look up the history), that > David ended up doing that merge and that ends up being why I never saw > a conflict. Yeah, commit b50afd203a5e ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") actually merges v4.8 into the net-next tree. -- Cheers, Stephen Rothwell