Hi all, On Thu, 10 Dec 2020 15:03:23 +0100 Michal Simek <monstr@xxxxxxxxx> wrote: > > On 10. 12. 20 5:58, Stephen Rothwell wrote: > > > > Today's linux-next merge of the tip tree got conflicts in: > > > > arch/microblaze/Kconfig > > arch/microblaze/mm/Makefile > > > > between commit: > > > > 05cdf457477d ("microblaze: Remove noMMU code") > > > > from the microblaze tree and commit: > > > > 7ac1b26b0a72 ("microblaze/mm/highmem: Switch to generic kmap atomic") > > > > from the tip 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 letting me know. I will mentioned it to Linus. > Your resolution is correct. These are now conflicts between the microblaze tree and Linus' tree. -- Cheers, Stephen Rothwell
Attachment:
pgpU5vagXuoja.pgp
Description: OpenPGP digital signature