From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755995AbdKJEjK (ORCPT ); Thu, 9 Nov 2017 23:39:10 -0500 Received: from shards.monkeyblade.net ([184.105.139.130]:50234 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755926AbdKJEjJ (ORCPT ); Thu, 9 Nov 2017 23:39:09 -0500 Date: Fri, 10 Nov 2017 13:39:05 +0900 (KST) Message-Id: <20171110.133905.725214727380201198.davem@davemloft.net> To: sfr@canb.auug.org.au Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, xiyou.wangcong@gmail.com Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree From: David Miller In-Reply-To: <20171110103100.3cffee49@canb.auug.org.au> References: <20171110103100.3cffee49@canb.auug.org.au> X-Mailer: Mew version 6.7 on Emacs 25.3 / 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]); Thu, 09 Nov 2017 20:39:08 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Rothwell Date: Fri, 10 Nov 2017 10:31:00 +1100 > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_basic.c > net/sched/cls_u32.c > > between commits: > > 0b2a59894b76 ("cls_basic: use tcf_exts_get_net() before call_rcu()") > 35c55fc156d8 ("cls_u32: use tcf_exts_get_net() before call_rcu()") > > from Linus' tree and commit: > > 1d8134fea2eb ("net_sched: use idr to allocate basic filter handles") > > from the net-next tree. This should be resolved as I've just merged 'net' into 'net-next'.