netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yoshinori Sato <ysato@users.sourceforge.jp>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
	Networking <netdev@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Krzysztof Kozlowski <krzk@kernel.org>,
	Jiri Pirko <jiri@mellanox.com>
Subject: Re: linux-next: manual merge of the net-next tree with the sh tree
Date: Fri, 12 Jul 2019 14:49:00 +0900	[thread overview]
Message-ID: <87y313950z.wl-ysato@users.sourceforge.jp> (raw)
In-Reply-To: <20190712105928.2846f8d0@canb.auug.org.au>

On Fri, 12 Jul 2019 09:59:28 +0900,
Stephen Rothwell wrote:
> 
> [1  <text/plain; US-ASCII (quoted-printable)>]
> Hi all,
> 
> On Mon, 17 Jun 2019 11:40:11 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <application/pgp-signature (7bit)>]
> No public key for 015042F34957D06C created at 2019-07-12T09:59:28+0900 using RSA

-- 
Yosinori Sato

  reply	other threads:[~2019-07-12  5:55 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-17  1:40 linux-next: manual merge of the net-next tree with the sh tree Stephen Rothwell
2019-07-08 23:22 ` Stephen Rothwell
2019-07-12  0:59 ` Stephen Rothwell
2019-07-12  5:49   ` Yoshinori Sato [this message]
2019-07-12  6:23     ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87y313950z.wl-ysato@users.sourceforge.jp \
    --to=ysato@users.sourceforge.jp \
    --cc=davem@davemloft.net \
    --cc=jiri@mellanox.com \
    --cc=krzk@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).