* linux-next: manual merge of the spi tree with the arm-soc tree
@ 2022-03-01 3:31 Stephen Rothwell
2022-03-22 22:03 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2022-03-01 3:31 UTC (permalink / raw)
To: Mark Brown, Olof Johansson, Arnd Bergmann, ARM
Cc: Jonathan Cameron, Linus Walleij, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 755 bytes --]
Hi all,
Today's linux-next merge of the spi tree got a conflict in:
arch/arm/mach-pxa/stargate2.c
between commit:
28f74201e37c ("ARM: pxa: remove Intel Imote2 and Stargate 2 boards")
from the arm-soc tree and commit:
31455bbda208 ("spi: pxa2xx_spi: Convert to use GPIO descriptors")
from the spi tree.
I fixed it up (I just removed the file) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the spi tree with the arm-soc tree
2022-03-01 3:31 linux-next: manual merge of the spi tree with the arm-soc tree Stephen Rothwell
@ 2022-03-22 22:03 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2022-03-22 22:03 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann
Cc: Mark Brown, ARM, Jonathan Cameron, Linus Walleij,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 948 bytes --]
Hi all,
On Tue, 1 Mar 2022 14:31:36 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the spi tree got a conflict in:
>
> arch/arm/mach-pxa/stargate2.c
>
> between commit:
>
> 28f74201e37c ("ARM: pxa: remove Intel Imote2 and Stargate 2 boards")
>
> from the arm-soc tree and commit:
>
> 31455bbda208 ("spi: pxa2xx_spi: Convert to use GPIO descriptors")
>
> from the spi tree.
>
> I fixed it up (I just removed the file) 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.
This is now a conflict between the arm-soc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-22 22:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-01 3:31 linux-next: manual merge of the spi tree with the arm-soc tree Stephen Rothwell
2022-03-22 22:03 ` 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).