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

Hi Stephen On 05/09/2013 02:35 AM, Stephen Rothwell wrote: > Hi Michal, > > Today's linux-next merge of the microblaze tree got a conflict in > arch/microblaze/mm/init.c between commit 7beb5987875b ("mm/microblaze: > use common help functions to free reserved pages") from Linus' tree and > commit

linux-next: manual merge of the microblaze tree with Linus' tree

Hi Michal, Today's linux-next merge of the microblaze tree got a conflict in arch/microblaze/mm/init.c between commit 7beb5987875b ("mm/microblaze: use common help functions to free reserved pages") from Linus' tree and commits 17408c87ba9e ("microblaze: Fix free_init_pages function") and c5c09c08