From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code Date: Thu, 7 Jan 2010 11:04:22 +1100 Message-ID: <20100107110422.3bc51a12.sfr@canb.auug.org.au> References: <20100106140409.ba0f63d1.akpm@linux-foundation.org> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Thu__7_Jan_2010_11_04_22_+1100_y6U+QuFA=24u49Ic" Return-path: In-Reply-To: <20100106140409.ba0f63d1.akpm@linux-foundation.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: To: Andrew Morton Cc: Phillip Lougher , linux-embedded@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, phillip.lougher@gmail.com, tim.bird@am.sony.com, Albin Tonnerre --Signature=_Thu__7_Jan_2010_11_04_22_+1100_y6U+QuFA=24u49Ic Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Andrew, On Wed, 6 Jan 2010 14:04:09 -0800 Andrew Morton = 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 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. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Thu__7_Jan_2010_11_04_22_+1100_y6U+QuFA=24u49Ic Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAktFJQYACgkQjjKRsyhoI8zIgACfTXVPPDd1NK4JnJWDtShtIDod OT0AoJ7ue4wpGRSHlulNfApNzbF1iy8X =/BwD -----END PGP SIGNATURE----- --Signature=_Thu__7_Jan_2010_11_04_22_+1100_y6U+QuFA=24u49Ic--