Messages in this thread | | | Date | Fri, 9 Dec 2011 22:11:47 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the arm-lpae tree with the arm tree |
| |
Hi Catalin,
On Fri, 9 Dec 2011 10:36:52 +0000 Catalin Marinas <catalin.marinas@arm.com> wrote: > > The fix looks correct but Russell merged the LPAE patches into his tree > last night and sorted out the conflicts, so you can now drop my for-next > branch from -next (I'll still keep the kmemleak one).
OK, will do. Thanks for letting me know. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |