lkml.org 
[lkml]   [2013]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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
c5c09c08718b ("microblaze: Fix initrd support") from the microblaze tree.

I just used the version from Linus' tree (I am not sure if that is the
correct solution) and can carry the fix as necessary (no action is
required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-05-09 03:21    [W:0.056 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site