* linux-next: manual merge of the gpio tree with the mips tree
@ 2020-01-10 4:51 Stephen Rothwell
2020-01-13 9:12 ` Paul Kocialkowski
2020-01-29 22:37 ` Stephen Rothwell
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2020-01-10 4:51 UTC (permalink / raw)
To: Linus Walleij, Ralf Baechle, James Hogan
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Paul Kocialkowski, 周琰杰 (Zhou Yanjie),
Paul Burton
[-- Attachment #1: Type: text/plain, Size: 1317 bytes --]
Hi all,
Today's linux-next merge of the gpio tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.yaml
between commit:
9d022be3c192 ("dt-bindings: Document yna vendor-prefix.")
from the mips tree and commit:
885503fbea21 ("dt-bindings: Add Xylon vendor prefix")
from the gpio 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 Documentation/devicetree/bindings/vendor-prefixes.yaml
index b44257d0e16e,9cb3bc683db7..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1082,8 -1060,8 +1082,10 @@@ patternProperties
description: Xilinx
"^xunlong,.*":
description: Shenzhen Xunlong Software CO.,Limited
+ "^yna,.*":
+ description: YSH & ATIL
+ "^xylon,.*":
+ description: Xylon
"^yones-toptech,.*":
description: Yones Toptech Co., Ltd.
"^ysoft,.*":
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the gpio tree with the mips tree
2020-01-10 4:51 linux-next: manual merge of the gpio tree with the mips tree Stephen Rothwell
@ 2020-01-13 9:12 ` Paul Kocialkowski
2020-01-13 11:45 ` Stephen Rothwell
2020-01-29 22:37 ` Stephen Rothwell
1 sibling, 1 reply; 6+ messages in thread
From: Paul Kocialkowski @ 2020-01-13 9:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus Walleij, Ralf Baechle, James Hogan,
Linux Next Mailing List, Linux Kernel Mailing List,
周琰杰 (Zhou Yanjie),
Paul Burton
[-- Attachment #1: Type: text/plain, Size: 1761 bytes --]
Hi,
On Fri 10 Jan 20, 15:51, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> Documentation/devicetree/bindings/vendor-prefixes.yaml
>
> between commit:
>
> 9d022be3c192 ("dt-bindings: Document yna vendor-prefix.")
>
> from the mips tree and commit:
>
> 885503fbea21 ("dt-bindings: Add Xylon vendor prefix")
>
> from the gpio 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.
Thanks for the fix. We might want to keep the list ordered though, with
"xylon" listed after "xunlong" and before "yna".
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
> index b44257d0e16e,9cb3bc683db7..000000000000
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@@ -1082,8 -1060,8 +1082,10 @@@ patternProperties
> description: Xilinx
> "^xunlong,.*":
> description: Shenzhen Xunlong Software CO.,Limited
> + "^yna,.*":
> + description: YSH & ATIL
> + "^xylon,.*":
> + description: Xylon
So reversing the two blocks above.
What do you think?
Cheers,
Paul
> "^yones-toptech,.*":
> description: Yones Toptech Co., Ltd.
> "^ysoft,.*":
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the gpio tree with the mips tree
2020-01-13 9:12 ` Paul Kocialkowski
@ 2020-01-13 11:45 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2020-01-13 11:45 UTC (permalink / raw)
To: Paul Kocialkowski
Cc: Linus Walleij, Ralf Baechle, James Hogan,
Linux Next Mailing List, Linux Kernel Mailing List,
周琰杰 (Zhou Yanjie),
Paul Burton
[-- Attachment #1: Type: text/plain, Size: 717 bytes --]
Hi Paul,
On Mon, 13 Jan 2020 10:12:37 +0100 Paul Kocialkowski <paul.kocialkowski@bootlin.com> wrote:
>
> Thanks for the fix. We might want to keep the list ordered though, with
> "xylon" listed after "xunlong" and before "yna".
>
> > description: Xilinx
> > "^xunlong,.*":
> > description: Shenzhen Xunlong Software CO.,Limited
> > + "^yna,.*":
> > + description: YSH & ATIL
> > + "^xylon,.*":
> > + description: Xylon
>
> So reversing the two blocks above.
>
> What do you think?
Absolutely. I have changed my resolution for tomorrow. What really
matters, though is what we end up with in Linus' tree.
Thanks for checking.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the gpio tree with the mips tree
2020-01-10 4:51 linux-next: manual merge of the gpio tree with the mips tree Stephen Rothwell
2020-01-13 9:12 ` Paul Kocialkowski
@ 2020-01-29 22:37 ` Stephen Rothwell
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2020-01-29 22:37 UTC (permalink / raw)
To: Linus Walleij, Ralf Baechle, James Hogan
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Paul Kocialkowski, 周琰杰 (Zhou Yanjie),
Paul Burton
[-- Attachment #1: Type: text/plain, Size: 1582 bytes --]
Hi all,
On Fri, 10 Jan 2020 15:51:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> Documentation/devicetree/bindings/vendor-prefixes.yaml
>
> between commit:
>
> 9d022be3c192 ("dt-bindings: Document yna vendor-prefix.")
>
> from the mips tree and commit:
>
> 885503fbea21 ("dt-bindings: Add Xylon vendor prefix")
>
> from the gpio 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 Documentation/devicetree/bindings/vendor-prefixes.yaml
> index b44257d0e16e,9cb3bc683db7..000000000000
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@@ -1082,8 -1060,8 +1082,10 @@@ patternProperties
> description: Xilinx
> "^xunlong,.*":
> description: Shenzhen Xunlong Software CO.,Limited
> + "^yna,.*":
> + description: YSH & ATIL
> + "^xylon,.*":
> + description: Xylon
> "^yones-toptech,.*":
> description: Yones Toptech Co., Ltd.
> "^ysoft,.*":
This is now a conflict between the mips tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the gpio tree with the mips tree
@ 2016-05-12 4:17 Stephen Rothwell
2016-05-12 13:35 ` Linus Walleij
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2016-05-12 4:17 UTC (permalink / raw)
To: Linus Walleij, Ralf Baechle; +Cc: linux-next, linux-kernel, Huacai Chen
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
arch/mips/Kconfig
between commit:
cec47c182286 ("MIPS: Loongson: Add Loongson-3A R2 basic support")
from the mips tree and commit:
d30a2b47d4c2 ("MIPS: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB")
from the gpio 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/mips/Kconfig
index ac9bfad794eb,512b5def854d..000000000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -1354,8 -1340,7 +1352,8 @@@ config CPU_LOONGSON
select CPU_SUPPORTS_HUGEPAGES
select WEAK_ORDERING
select WEAK_REORDERING_BEYOND_LLSC
+ select MIPS_PGD_C0_CONTEXT
- select ARCH_REQUIRE_GPIOLIB
+ select GPIOLIB
help
The Loongson 3 processor implements the MIPS64R2 instruction
set with many extensions.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the gpio tree with the mips tree
2016-05-12 4:17 Stephen Rothwell
@ 2016-05-12 13:35 ` Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2016-05-12 13:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Ralf Baechle, linux-next, linux-kernel, Huacai Chen
On Thu, May 12, 2016 at 6:17 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
Yeah this is trivial and ACKed by the MIPS mainatainer so should be
safe, thanks!
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-01-29 22:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-10 4:51 linux-next: manual merge of the gpio tree with the mips tree Stephen Rothwell
2020-01-13 9:12 ` Paul Kocialkowski
2020-01-13 11:45 ` Stephen Rothwell
2020-01-29 22:37 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2016-05-12 4:17 Stephen Rothwell
2016-05-12 13:35 ` Linus Walleij
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).