From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753486AbbCWMzi (ORCPT ); Mon, 23 Mar 2015 08:55:38 -0400 Received: from smtprelay0182.hostedemail.com ([216.40.44.182]:34838 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752930AbbCWMzf (ORCPT ); Mon, 23 Mar 2015 08:55:35 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 40,2.5,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::::,RULES_HIT:41:355:379:541:599:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1540:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:2828:3138:3139:3140:3141:3142:3352:3622:3865:3866:3868:3870:3871:3872:4321:5007:6261:10004:10400:10848:11026:11232:11473:11658:11914:12043:12050:12109:12295:12296:12517:12519:12740:13069:13141:13230:13311:13357:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: cows99_3079bdb395038 X-Filterd-Recvd-Size: 1890 Message-ID: <1427115331.16851.11.camel@perches.com> Subject: Re: linux-next: manual merge of the net-next tree with the net tree From: Joe Perches To: Pablo Neira Ayuso Cc: Stephen Rothwell , David Miller , netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Patrick McHardy Date: Mon, 23 Mar 2015 05:55:31 -0700 In-Reply-To: <20150323124723.GA6740@salvia> References: <20150323140841.0b807b95@canb.auug.org.au> <20150323124723.GA6740@salvia> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2015-03-23 at 13:47 +0100, Pablo Neira Ayuso wrote: > On Mon, Mar 23, 2015 at 02:08:41PM +1100, Stephen Rothwell wrote: > > 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. trivia: > > diff --cc net/netfilter/nf_tables_core.c [] > > + static struct nf_loginfo trace_loginfo = { > > + .type = NF_LOG_TYPE_LOG, > > + .u = { > > + .log = { > > + .level = 4, Perhaps all the .level = 4 uses should be LOGLEVEL_WARNING and .level = 5 should be LOGLEVEL_NOTICE