From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751590AbcJFC4X (ORCPT ); Wed, 5 Oct 2016 22:56:23 -0400 Received: from shards.monkeyblade.net ([184.105.139.130]:52164 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750868AbcJFC4V (ORCPT ); Wed, 5 Oct 2016 22:56:21 -0400 Date: Wed, 05 Oct 2016 22:56:12 -0400 (EDT) Message-Id: <20161005.225612.251098478131222998.davem@davemloft.net> To: sfr@canb.auug.org.au Cc: torvalds@linux-foundation.org, netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, pablo@netfilter.org, liping.zhang@spreadtrum.com Subject: Re: [GIT] Networking From: David Miller In-Reply-To: <20161006135152.3fd229cb@canb.auug.org.au> References: <20161006115235.1a89c0da@canb.auug.org.au> <20161006135152.3fd229cb@canb.auug.org.au> 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 19:56:17 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Rothwell Date: Thu, 6 Oct 2016 13:51:52 +1100 > 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. Yes, this is where the change got lost. I have all of the fixups queued up in my net tree and will send in a pull request later.