[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100107110422.3bc51a12.sfr@canb.auug.org.au>
Date: Thu, 7 Jan 2010 11:04:22 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Phillip Lougher <phillip@...gher.demon.co.uk>,
linux-embedded@...r.kernel.org, linux-fsdevel@...r.kernel.org,
linux-kernel@...r.kernel.org, phillip.lougher@...il.com,
tim.bird@...sony.com,
Albin Tonnerre <albin.tonnerre@...e-electrons.com>
Subject: Re: [PATCH V2 6/8] lzma: Make lzma available to non
initramfs/initrd code
Hi Andrew,
On Wed, 6 Jan 2010 14:04:09 -0800 Andrew Morton <akpm@...ux-foundation.org> wrote:
>
> So if I go ahead with that merge, linux-next will need fixing. And I
> didn't get down and work what the appropriate fix is, and I don't want
> to break linux-next in serious ways.
Why not, everyone else does :-)
> So what to do? I guess I could go ahead with the mainline merge, and
> Stephen drops <whatever that tree was> from linux-next until it has
> been fixed up?
Just do the merge ... I will just need to drop the squashfs tree until
they do a merge/rebase with Linus' tree and fix it all up.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists