From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753503AbbCXC3j (ORCPT ); Mon, 23 Mar 2015 22:29:39 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:60063 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752800AbbCXC3g (ORCPT ); Mon, 23 Mar 2015 22:29:36 -0400 Date: Mon, 23 Mar 2015 22:29:34 -0400 (EDT) Message-Id: <20150323.222934.1290096929224794650.davem@davemloft.net> To: pablo@netfilter.org Cc: sfr@canb.auug.org.au, netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, kaber@trash.net Subject: Re: linux-next: manual merge of the net-next tree with the net tree From: David Miller In-Reply-To: <20150323124723.GA6740@salvia> References: <20150323140841.0b807b95@canb.auug.org.au> <20150323124723.GA6740@salvia> X-Mailer: Mew version 6.6 on Emacs 24.4 / 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]); Mon, 23 Mar 2015 19:29:36 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pablo Neira Ayuso Date: Mon, 23 Mar 2015 13:47:23 +0100 > On Mon, Mar 23, 2015 at 02:08:41PM +1100, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the net-next tree got a conflict in >> net/netfilter/nf_tables_core.c between commit 4017a7ee693d ("netfilter: >> restore rule tracing via nfnetlink_log") from the net tree and commit >> 01ef16c2dd2e ("netfilter: nf_tables: minor tracing cleanups") from the >> net-next tree. >> >> I fixed it up (see below) and can carry the fix as necessary (no action >> is required). > > This looks good, thanks for adressing this conflict Stephen. Pablo, I just pushed out a merge of net into net-next, please double check that I handled this conflict correctly. Thanks!