From: Paul Mundt <lethal@linux-sh.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Howells <dhowells@redhat.com>,
linux-next@vger.kernel.org,
Christoph Lameter <cl@linux-foundation.org>,
Pekka Enberg <penberg@cs.helsinki.fi>
Subject: Re: linux-next: manual merge of the nommu tree
Date: Thu, 11 Dec 2008 16:42:49 +0900 [thread overview]
Message-ID: <20081211074248.GA11314@linux-sh.org> (raw)
In-Reply-To: <20081211182530.924d4af6.sfr@canb.auug.org.au>
On Thu, Dec 11, 2008 at 06:25:30PM +1100, Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the nommu tree got a conflict in
> Documentation/sysctl/vm.txt between commit
> cb8fc7a88a0069ebdab220180bf9b45e568f0ba9 ("slub: Trigger defragmentation
> from memory reclaim") from the slab tree and commit
> 1a5d96d0151ce2ec77bf08498751fe8d9365c95f ("NOMMU: Make mmap allocation
> page trimming behaviour configurable.") from the nommu tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
I suppose this is what happens when everyone has the same bright idea of
appending to the end of the file. Though I am surprised that there was
contention in Documentation/ of all places. Thanks for fixing this up.
next prev parent reply other threads:[~2008-12-11 7:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-11 7:25 linux-next: manual merge of the nommu tree Stephen Rothwell
2008-12-11 7:42 ` Paul Mundt [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-12-11 7:43 Stephen Rothwell
2009-01-08 4:30 Stephen Rothwell
2009-01-08 7:20 ` Matt Mackall
2009-01-08 12:46 ` David Howells
2009-01-08 13:06 ` Stephen Rothwell
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=20081211074248.GA11314@linux-sh.org \
--to=lethal@linux-sh.org \
--cc=cl@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=linux-next@vger.kernel.org \
--cc=penberg@cs.helsinki.fi \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.