From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936435AbcJFCOY (ORCPT ); Wed, 5 Oct 2016 22:14:24 -0400 Received: from mail-oi0-f51.google.com ([209.85.218.51]:35678 "EHLO mail-oi0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753761AbcJFCOX (ORCPT ); Wed, 5 Oct 2016 22:14:23 -0400 MIME-Version: 1.0 In-Reply-To: <20161006115235.1a89c0da@canb.auug.org.au> References: <20161005.014437.1946431553783736769.davem@davemloft.net> <20161006092947.25ae781c@canb.auug.org.au> <20161006115235.1a89c0da@canb.auug.org.au> From: Linus Torvalds Date: Wed, 5 Oct 2016 19:14:21 -0700 X-Google-Sender-Auth: GxNd7fD9JYEeq2jWyxtryfAH-lI Message-ID: Subject: Re: [GIT] Networking To: Stephen Rothwell Cc: David Miller , NetFilter , Network Development , Linux Kernel Mailing List , Pablo Neira Ayuso , Liping Zhang Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Linus