* linux-next: manual merge of the random tree with the powerpc tree
@ 2022-07-07 7:32 Stephen Rothwell
2022-07-07 10:52 ` Jason A. Donenfeld
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2022-07-07 7:32 UTC (permalink / raw)
To: Theodore Ts'o, Jason A. Donenfeld, Michael Ellerman
Cc: PowerPC, Juerg Haefliger, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 761 bytes --]
Hi all,
Today's linux-next merge of the random tree got a conflict in:
arch/powerpc/Kconfig
between commit:
cea9d62b64c9 ("powerpc: Kconfig: Replace tabs with whitespaces")
from the powerpc tree and commit:
a2ff4b7600cd ("random: remove CONFIG_ARCH_RANDOM")
from the random tree.
I fixed it up (the latter removed some lines updated by the former) 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] 3+ messages in thread* Re: linux-next: manual merge of the random tree with the powerpc tree
2022-07-07 7:32 linux-next: manual merge of the random tree with the powerpc tree Stephen Rothwell
@ 2022-07-07 10:52 ` Jason A. Donenfeld
2022-07-07 12:03 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Jason A. Donenfeld @ 2022-07-07 10:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michael Ellerman, PowerPC, Juerg Haefliger,
Linux Kernel Mailing List, Linux Next Mailing List
Hi Stephen,
On Thu, Jul 7, 2022 at 9:36 AM Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the random tree got a conflict in:
>
> arch/powerpc/Kconfig
>
> between commit:
>
> cea9d62b64c9 ("powerpc: Kconfig: Replace tabs with whitespaces")
>
> from the powerpc tree and commit:
>
> a2ff4b7600cd ("random: remove CONFIG_ARCH_RANDOM")
>
> from the random tree.
>
> I fixed it up (the latter removed some lines updated by the former) 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.
Oh darn. Any clever tricks to prevent the merge conflict from
happening? Or is this trivial enough that we'll let Linus deal with
it?
Jason
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the random tree with the powerpc tree
2022-07-07 10:52 ` Jason A. Donenfeld
@ 2022-07-07 12:03 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2022-07-07 12:03 UTC (permalink / raw)
To: Jason A. Donenfeld
Cc: Michael Ellerman, PowerPC, Juerg Haefliger,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
Hi Jason,
On Thu, 7 Jul 2022 12:52:54 +0200 "Jason A. Donenfeld" <Jason@zx2c4•com> wrote:
>
> Oh darn. Any clever tricks to prevent the merge conflict from
> happening? Or is this trivial enough that we'll let Linus deal with
> it?
Just leave it for Linus, its pretty trivial.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-07 12:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-07 7:32 linux-next: manual merge of the random tree with the powerpc tree Stephen Rothwell
2022-07-07 10:52 ` Jason A. Donenfeld
2022-07-07 12: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