* linux-next: manual merge of the net-next tree with the sh tree
@ 2019-06-17 1:40 Stephen Rothwell
2019-07-08 23:22 ` Stephen Rothwell
2019-07-12 0:59 ` Stephen Rothwell
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Rothwell @ 2019-06-17 1:40 UTC (permalink / raw)
To: David Miller, Networking, Yoshinori Sato
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Krzysztof Kozlowski, Jiri Pirko
[-- Attachment #1: Type: text/plain, Size: 2084 bytes --]
Hi all,
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the net-next tree with the sh tree
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
1 sibling, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2019-07-08 23:22 UTC (permalink / raw)
To: David Miller, Networking, Yoshinori Sato
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Krzysztof Kozlowski, Jiri Pirko
[-- Attachment #1: Type: text/plain, Size: 2466 bytes --]
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
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the net-next tree with the sh tree
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
1 sibling, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2019-07-12 0:59 UTC (permalink / raw)
To: Yoshinori Sato
Cc: David Miller, Networking, Linux Next Mailing List,
Linux Kernel Mailing List, Krzysztof Kozlowski, Jiri Pirko
[-- Attachment #1: Type: text/plain, Size: 2399 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the net-next tree with the sh tree
2019-07-12 0:59 ` Stephen Rothwell
@ 2019-07-12 5:49 ` Yoshinori Sato
2019-07-12 6:23 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Yoshinori Sato @ 2019-07-12 5:49 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Networking, Linux Next Mailing List,
Linux Kernel Mailing List, Krzysztof Kozlowski, Jiri Pirko
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the net-next tree with the sh tree
2019-07-12 5:49 ` Yoshinori Sato
@ 2019-07-12 6:23 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2019-07-12 6:23 UTC (permalink / raw)
To: Yoshinori Sato
Cc: David Miller, Networking, Linux Next Mailing List,
Linux Kernel Mailing List, Krzysztof Kozlowski, Jiri Pirko
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
Hi Yoshinori,
On Fri, 12 Jul 2019 14:49:00 +0900 Yoshinori Sato <ysato@users.sourceforge.jp> wrote:
>
> I can not update sh-next now, so I will fix it tomorrow.
You don't need to (and should not) update your tree, just mention the
conflicts to Linus when you send your pull request.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-07-12 6:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2019-07-12 6:23 ` Stephen Rothwell
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).