* linux-next: manual merge of the davinci tree with the arm-soc tree
@ 2023-01-09 22:42 Stephen Rothwell
2023-01-10 17:18 ` Bartosz Golaszewski
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2023-01-09 22:42 UTC (permalink / raw)
To: Bartosz Golaszewski, Olof Johansson, Arnd Bergmann
Cc: ARM, Bartosz Golaszewski, Jilin Yuan, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 754 bytes --]
Hi all,
Today's linux-next merge of the davinci tree got a conflict in:
arch/arm/mach-davinci/board-dm365-evm.c
between commit:
fef6ca600ba7 ("ARM: davinci: remove unused board support")
from the arm-soc tree and commit:
84bde55c050b ("ARM: davinci: fix repeated words in comments")
from the davinci tree.
I fixed it up (I 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 davinci tree with the arm-soc tree
2023-01-09 22:42 linux-next: manual merge of the davinci tree with the arm-soc tree Stephen Rothwell
@ 2023-01-10 17:18 ` Bartosz Golaszewski
0 siblings, 0 replies; 2+ messages in thread
From: Bartosz Golaszewski @ 2023-01-10 17:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Bartosz Golaszewski, Olof Johansson, Arnd Bergmann, ARM,
Jilin Yuan, Linux Kernel Mailing List, Linux Next Mailing List
On Mon, 9 Jan 2023 at 23:42, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the davinci tree got a conflict in:
>
> arch/arm/mach-davinci/board-dm365-evm.c
>
> between commit:
>
> fef6ca600ba7 ("ARM: davinci: remove unused board support")
>
> from the arm-soc tree and commit:
>
> 84bde55c050b ("ARM: davinci: fix repeated words in comments")
>
> from the davinci tree.
>
> I fixed it up (I 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
I backed out this patch, thanks!
Bart
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-10 17:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-09 22:42 linux-next: manual merge of the davinci tree with the arm-soc tree Stephen Rothwell
2023-01-10 17:18 ` Bartosz Golaszewski
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).