From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the net-next tree with the
 netfilter tree
Date: Sat, 12 Nov 2016 23:43:00 -0500 (EST)
Message-ID: <20161112.234300.1975552998082760798.davem@davemloft.net>
References: <20161110105633.31ebdc76@canb.auug.org.au>
        <20161110003117.GA4285@salvia>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: sfr@canb.auug.org.au, netdev@vger.kernel.org,
        netfilter-devel@vger.kernel.org, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, xiyou.wangcong@gmail.com,
        johannes.berg@intel.com
To: pablo@netfilter.org
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20161110003117.GA4285@salvia>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: netfilter-devel.vger.kernel.org

From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 10 Nov 2016 01:31:17 +0100

> I think I cannot help to address this conflict myself.
> 
> 8fbfef7f505b is in my nf tree, while 489111e5c25b is in net-next. So
> you will hit this conflict by when you pull net into net-next.
> 
> So please keep this patch from Stephen to resolve the conflict in your
> radar to solve this.

I will, thank you.