From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932795AbcKMEnE (ORCPT ); Sat, 12 Nov 2016 23:43:04 -0500 Received: from shards.monkeyblade.net ([184.105.139.130]:60064 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932412AbcKMEnC (ORCPT ); Sat, 12 Nov 2016 23:43:02 -0500 Date: Sat, 12 Nov 2016 23:43:00 -0500 (EST) Message-Id: <20161112.234300.1975552998082760798.davem@davemloft.net> To: pablo@netfilter.org 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 Subject: Re: linux-next: manual merge of the net-next tree with the netfilter tree From: David Miller In-Reply-To: <20161110003117.GA4285@salvia> References: <20161110105633.31ebdc76@canb.auug.org.au> <20161110003117.GA4285@salvia> X-Mailer: Mew version 6.7 on Emacs 25.1 / 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]); Sat, 12 Nov 2016 19:43:32 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pablo Neira Ayuso 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.