Hi Andrew, On Wed, 6 Jan 2010 14:04:09 -0800 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgp50Ihzr0Enr.pgp
Description: PGP signature
