From: Andrew Morton <akpm@linux-foundation.org>
To: Phillip Lougher <phillip@lougher.demon.co.uk>
Cc: linux-embedded@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, phillip.lougher@gmail.com,
tim.bird@am.sony.com, Stephen Rothwell <sfr@canb.auug.org.au>,
Albin Tonnerre <albin.tonnerre@free-electrons.com>
Subject: Re: [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code
Date: Wed, 6 Jan 2010 16:31:13 -0800 [thread overview]
Message-ID: <20100106163113.637e47db.akpm@linux-foundation.org> (raw)
In-Reply-To: <4B4528C8.3020603@lougher.demon.co.uk>
On Thu, 07 Jan 2010 00:20:24 +0000
Phillip Lougher <phillip@lougher.demon.co.uk> wrote:
> Andrew Morton wrote:
>
> > 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?
> >
>
> Yes, I'm happy with that. The following patch is the necessary fix
> that needs to go into linux-next when you've gone ahead with the
> mainline merge of the lib-add-support-for-lzo-compressed-kernels.patch.
ooh, goody, thanks.
> diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c
> index db521f4..edd82c3 100644
> --- a/lib/decompress_unlzo.c
> +++ b/lib/decompress_unlzo.c
> @@ -39,6 +39,7 @@
>
> #include <linux/types.h>
> #include <linux/lzo.h>
> +#include <linux/decompress/unlzo_mm.h>
> #include <linux/decompress/mm.h>
>
> #include <linux/compiler.h>
Your email client is doing space-stuffing.
next prev parent reply other threads:[~2010-01-07 0:31 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
2010-01-07 0:20 ` Phillip Lougher
2010-01-07 0:31 ` Andrew Morton [this message]
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=20100106163113.637e47db.akpm@linux-foundation.org \
--to=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=sfr@canb.auug.org.au \
--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).