From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Phillip Lougher <phillip@lougher.demon.co.uk>,
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 <albin.tonnerre@free-electrons.com>
Subject: Re: [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code
Date: Thu, 7 Jan 2010 11:04:22 +1100 [thread overview]
Message-ID: <20100107110422.3bc51a12.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20100106140409.ba0f63d1.akpm@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 730 bytes --]
Hi Andrew,
On Wed, 6 Jan 2010 14:04:09 -0800 Andrew Morton <akpm@linux-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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2010-01-07 0:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-11 1:34 [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code Phillip Lougher
2010-01-06 22:04 ` Andrew Morton
2010-01-06 22:45 ` Albin Tonnerre
2010-01-07 0:04 ` Stephen Rothwell [this message]
2010-01-07 0:20 ` Phillip Lougher
2010-01-07 0:31 ` Andrew Morton
2010-01-07 0:37 ` Phillip Lougher
2010-01-07 7:43 ` [PATCH V2 6/8] lzma: Make lzma ... thunderbird ok Hein_Tibosch
2010-01-07 17:26 ` Marco Stornelli
-- strict thread matches above, loose matches on Subject: below --
2010-01-07 0:49 [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code Phillip Lougher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100107110422.3bc51a12.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=albin.tonnerre@free-electrons.com \
--cc=linux-embedded@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=phillip.lougher@gmail.com \
--cc=phillip@lougher.demon.co.uk \
--cc=tim.bird@am.sony.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).