Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp1497631imm;
        Wed, 15 Aug 2018 19:45:42 -0700 (PDT)
X-Google-Smtp-Source: AA+uWPwqnKG8HdyGI7HdnSNkO7CZoS/Cyvb8Db8zYhKDK2s5dLkEDmNxU+AXUb8j9EurJNCJIIyc
X-Received: by 2002:a17:902:6b46:: with SMTP id g6-v6mr27355938plt.251.1534387542259;
        Wed, 15 Aug 2018 19:45:42 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1534387542; cv=none;
        d=google.com; s=arc-20160816;
        b=fuByIgS1LSS2VPb2nB8119UL32oprKV9e37VJ6KbtN3CJfvXBu8OVy0wUhoiPwPTRL
         f26zR8etH7WcBlO4x88yG+yWYio01m/7tUf7DnZtNtANQ3i/pEFKrTSGSsNqXzCh1PP/
         ztysa6TS9NPwMgVBFV2aYRqRNLwo5ay1Pvb54UQ2L//vvazZbg2+7oIqK9K79q1e6Ww2
         KrIUTiqZhRK6lHNWTzHlzHOdkA436Y6wUfqvAQvx++ccL7VrDkbmBhHutgYGcs0bLfPO
         rE+CvP22EA9Ea6YfmT3NVan94TS8zxAmtReMuWp/su1gaU83FlBWQ6Jy+c12wYDbkKVM
         ePYQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:sender:user-agent:in-reply-to
         :content-disposition:mime-version:references:message-id:subject:cc
         :to:from:date:arc-authentication-results;
        bh=680JIVXf93QM5QOwK4hcQ3dH6EYtaTV9yis/fwTc+dU=;
        b=cKwvFuUBDf6lWTWNOXHfeLiGGqgv99CsbUkTBteErDPP6fOxOuyw9B/ARgPOqKGQ5X
         AcXxvTEWmW4pVXxnYMLR1xMtaxKkJ7J0uRsVF4/O71yRjUsnj5a/Od2kODyHBwd4I/w/
         Agsoxn5WGnhDTm6EjsLx69c938Lwwm1xca5fpzAdCjkkStqhPzwM42Oapn/Freh8tf2O
         WwZhvrv+/HHvSJ4JNXvt7iXE7oQKwkilBsf0sRnoTQXcrGFvGHPEoOX0+2VqMOYU7cj0
         9TDRcDltlfcqXv2sMrSxg3/+Big7dXZg+d16X7oddmUY0YI+JAeTrF0eowdOuH2De2oT
         cDmw==
ARC-Authentication-Results: i=1; mx.google.com;
       spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
        by mx.google.com with ESMTP id q185-v6si25663670pga.322.2018.08.15.19.45.27;
        Wed, 15 Aug 2018 19:45:42 -0700 (PDT)
Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Authentication-Results: mx.google.com;
       spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1731400AbeHPDDb (ORCPT <rfc822;gyapra2016@gmail.com>
        + 99 others); Wed, 15 Aug 2018 23:03:31 -0400
Received: from mail.us.es ([193.147.175.20]:44596 "EHLO mail.us.es"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1729005AbeHPDDb (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 15 Aug 2018 23:03:31 -0400
Received: from antivirus1-rhel7.int (unknown [192.168.2.11])
        by mail.us.es (Postfix) with ESMTP id 504D9C5157
        for <linux-kernel@vger.kernel.org>; Thu, 16 Aug 2018 02:06:32 +0200 (CEST)
Received: from antivirus1-rhel7.int (localhost [127.0.0.1])
        by antivirus1-rhel7.int (Postfix) with ESMTP id 3F1C3DA727
        for <linux-kernel@vger.kernel.org>; Thu, 16 Aug 2018 02:06:32 +0200 (CEST)
Received: by antivirus1-rhel7.int (Postfix, from userid 99)
        id 34075DA792; Thu, 16 Aug 2018 02:06:32 +0200 (CEST)
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on antivirus1-rhel7.int
X-Spam-Level: 
X-Spam-Status: No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,
        SMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1
Received: from antivirus1-rhel7.int (localhost [127.0.0.1])
        by antivirus1-rhel7.int (Postfix) with ESMTP id 3D9D8DA727;
        Thu, 16 Aug 2018 02:06:30 +0200 (CEST)
Received: from 192.168.1.97 (192.168.1.97)
 by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int);
 Thu, 16 Aug 2018 02:06:30 +0200 (CEST)
X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)
Received: from us.es (sys.soleta.eu [212.170.55.40])
        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
        (No client certificate requested)
        (Authenticated sender: 1984lsi)
        by entrada.int (Postfix) with ESMTPSA id 159504265A4E;
        Thu, 16 Aug 2018 02:06:30 +0200 (CEST)
Date:   Thu, 16 Aug 2018 02:08:51 +0200
X-SMTPAUTHUS: auth mail.us.es
From:   Pablo Neira Ayuso <pablo@netfilter.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     NetFilter <netfilter-devel@vger.kernel.org>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Matteo Croce <mcroce@redhat.com>, Julian Anastasov <ja@ssi.bg>
Subject: Re: linux-next: manual merge of the net-next tree with the netfilter
 tree
Message-ID: <20180816000851.if2neqxzbjlsd45n@salvia>
References: <20180807124932.73422224@canb.auug.org.au>
 <20180816094723.07452406@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20180816094723.07452406@canb.auug.org.au>
User-Agent: NeoMutt/20170113 (1.7.2)
X-Virus-Scanned: ClamAV using ClamSMTP
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Aug 16, 2018 at 09:47:23AM +1000, Stephen Rothwell wrote:
> On Tue, 7 Aug 2018 12:49:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
[...]
> This is now a conflict between Linus' tree and the netfilter tree.

Will rebase nf.git here, so next pull request already deals with this
here to make it easier for upstream maintainers.

@Matteo, let me know if this is a problem in your case, you may have
references to the original commits in your backport queue probably.

Thanks for the heads up and sorry for the inconvenience.