From: David Howells <dhowells@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: dhowells@redhat.com, linux-next@vger.kernel.org,
Matt Mackall <mpm@selenic.com>
Subject: Re: linux-next: manual merge of the nommu tree
Date: Thu, 08 Jan 2009 12:46:29 +0000 [thread overview]
Message-ID: <28278.1231418789@redhat.com> (raw)
In-Reply-To: <20090108153009.96d9d01a.sfr@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the nommu tree got a conflict in
> mm/tiny-shmem.c between commit 853ac43ab194f5051b27a55060215d696dc9480d
> ("shmem: unify regular and tiny shmem") from Linus' tree and commit
> d10f9907ba3626261f45dbb498867f441f06c486 ("shmem: remove unused
> shmem_get_unmapped_area") from the nommu tree.
I've updated the nommu tree.
David
next prev parent reply other threads:[~2009-01-08 12:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-08 4:30 linux-next: manual merge of the nommu tree Stephen Rothwell
2009-01-08 7:20 ` Matt Mackall
2009-01-08 12:46 ` David Howells [this message]
2009-01-08 13:06 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-12-11 7:43 Stephen Rothwell
2008-12-11 7:25 Stephen Rothwell
2008-12-11 7:42 ` Paul Mundt
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=28278.1231418789@redhat.com \
--to=dhowells@redhat.com \
--cc=linux-next@vger.kernel.org \
--cc=mpm@selenic.com \
--cc=sfr@canb.auug.org.au \
/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).