* linux-next: manual merge of the microblaze tree with the asm-generic tree
@ 2020-12-09 23:57 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2020-12-09 23:57 UTC (permalink / raw)
To: Michal Simek, Arnd Bergmann
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Michal Simek,
Nicholas Piggin
[-- Attachment #1: Type: text/plain, Size: 784 bytes --]
Hi all,
Today's linux-next merge of the microblaze tree got a conflict in:
arch/microblaze/include/asm/mmu_context.h
between commit:
94f89922e1e0 ("asm-generic: add generic MMU versions of mmu context functions")
from the asm-generic tree and commit:
05cdf457477d ("microblaze: Remove noMMU code")
from the microblaze tree.
I fixed it up (I just used the latter version) 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] only message in thread
only message in thread, other threads:[~2020-12-09 23:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-09 23:57 linux-next: manual merge of the microblaze tree with the asm-generic tree 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).