From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBBC0C742A8 for ; Fri, 12 Jul 2019 05:55:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BAD4721019 for ; Fri, 12 Jul 2019 05:55:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725989AbfGLFzn (ORCPT ); Fri, 12 Jul 2019 01:55:43 -0400 Received: from mail01.asahi-net.or.jp ([202.224.55.13]:39381 "EHLO mail01.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725807AbfGLFzm (ORCPT ); Fri, 12 Jul 2019 01:55:42 -0400 X-Greylist: delayed 397 seconds by postgrey-1.27 at vger.kernel.org; Fri, 12 Jul 2019 01:55:40 EDT Received: from h61-195-96-97.vps.ablenet.jp (h61-195-96-97.ablenetvps.ne.jp [61.195.96.97]) (Authenticated sender: PQ4Y-STU) by mail01.asahi-net.or.jp (Postfix) with ESMTPA id 5D2CA12B1F6; Fri, 12 Jul 2019 14:49:01 +0900 (JST) Received: from yo-satoh-debian.ysato.ml (ZM005235.ppp.dion.ne.jp [222.8.5.235]) by h61-195-96-97.vps.ablenet.jp (Postfix) with ESMTPSA id A168F240085; Fri, 12 Jul 2019 14:49:00 +0900 (JST) Date: Fri, 12 Jul 2019 14:49:00 +0900 Message-ID: <87y313950z.wl-ysato@users.sourceforge.jp> From: Yoshinori Sato To: Stephen Rothwell Cc: David Miller , Networking , Linux Next Mailing List , Linux Kernel Mailing List , Krzysztof Kozlowski , Jiri Pirko Subject: Re: linux-next: manual merge of the net-next tree with the sh tree In-Reply-To: <20190712105928.2846f8d0@canb.auug.org.au> References: <20190617114011.4159295e@canb.auug.org.au> <20190712105928.2846f8d0@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.8 EasyPG/1.0.0 Emacs/25.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Fri, 12 Jul 2019 09:59:28 +0900, Stephen Rothwell wrote: > > [1 ] > Hi all, > > On Mon, 17 Jun 2019 11:40:11 +1000 Stephen Rothwell wrote: > > > > Today's linux-next merge of the net-next tree got conflicts in: > > > > arch/sh/configs/se7712_defconfig > > arch/sh/configs/se7721_defconfig > > arch/sh/configs/titan_defconfig > > > > between commit: > > > > 7c04efc8d2ef ("sh: configs: Remove useless UEVENT_HELPER_PATH") > > > > from the sh tree and commit: > > > > a51486266c3b ("net: sched: remove NET_CLS_IND config option") > > > > from the net-next tree. > > > > I fixed it up (see below) and can carry the fix as necessary. This > > is now fixed as far as linux-next is concerned, but any non trivial > > conflicts should be mentioned to your upstream maintainer when your tree > > is submitted for merging. You may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularly > > complex conflicts. > > > > -- > > Cheers, > > Stephen Rothwell > > > > diff --cc arch/sh/configs/se7712_defconfig > > index 6ac7d362e106,1e116529735f..000000000000 > > --- a/arch/sh/configs/se7712_defconfig > > +++ b/arch/sh/configs/se7712_defconfig > > @@@ -63,7 -63,7 +63,6 @@@ CONFIG_NET_SCH_NETEM= > > CONFIG_NET_CLS_TCINDEX=y > > CONFIG_NET_CLS_ROUTE4=y > > CONFIG_NET_CLS_FW=y > > - CONFIG_NET_CLS_IND=y > > -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > > CONFIG_MTD=y > > CONFIG_MTD_BLOCK=y > > CONFIG_MTD_CFI=y > > diff --cc arch/sh/configs/se7721_defconfig > > index ffd15acc2a04,c66e512719ab..000000000000 > > --- a/arch/sh/configs/se7721_defconfig > > +++ b/arch/sh/configs/se7721_defconfig > > @@@ -62,7 -62,7 +62,6 @@@ CONFIG_NET_SCH_NETEM= > > CONFIG_NET_CLS_TCINDEX=y > > CONFIG_NET_CLS_ROUTE4=y > > CONFIG_NET_CLS_FW=y > > - CONFIG_NET_CLS_IND=y > > -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > > CONFIG_MTD=y > > CONFIG_MTD_BLOCK=y > > CONFIG_MTD_CFI=y > > diff --cc arch/sh/configs/titan_defconfig > > index 1c1c78e74fbb,171ab05ce4fc..000000000000 > > --- a/arch/sh/configs/titan_defconfig > > +++ b/arch/sh/configs/titan_defconfig > > @@@ -142,7 -142,7 +142,6 @@@ CONFIG_GACT_PROB= > > CONFIG_NET_ACT_MIRRED=m > > CONFIG_NET_ACT_IPT=m > > CONFIG_NET_ACT_PEDIT=m > > - CONFIG_NET_CLS_IND=y > > -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > > CONFIG_FW_LOADER=m > > CONFIG_CONNECTOR=m > > CONFIG_MTD=m > > This is now a conflict between the sh tree and Linus' tree. OK. I can not update sh-next now, so I will fix it tomorrow. > -- > Cheers, > Stephen Rothwell > [2 OpenPGP digital signature ] > No public key for 015042F34957D06C created at 2019-07-12T09:59:28+0900 using RSA -- Yosinori Sato