Re: linux-next: manual merge of the tip tree with the microblaze tree

2020-12-16 Thread Michal Simek
Hi Stephen, On 16. 12. 20 2:00, Stephen Rothwell wrote: > Hi all, > > On Thu, 10 Dec 2020 15:03:23 +0100 Michal Simek 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/microblaz

Re: linux-next: manual merge of the tip tree with the microblaze tree

2020-12-15 Thread Stephen Rothwell
Hi all, On Thu, 10 Dec 2020 15:03:23 +0100 Michal Simek 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

Re: linux-next: manual merge of the tip tree with the microblaze tree

2020-12-10 Thread Michal Simek
Hi Stephen, On 10. 12. 20 5:58, Stephen Rothwell wrote: > Hi all, > > 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