From: Pekka Enberg <penberg@cs.helsinki.fi>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Lameter <cl@linux-foundation.org>,
linux-next@vger.kernel.org, Alexey Dobriyan <adobriyan@gmail.com>
Subject: Re: linux-next: manual merge of the slab tree
Date: Mon, 03 Nov 2008 11:38:59 +0200 [thread overview]
Message-ID: <1225705140.22949.12.camel@penberg-laptop> (raw)
In-Reply-To: <20081103150750.87fe762d.sfr@canb.auug.org.au>
Hi Stephen,
On Mon, 2008-11-03 at 15:07 +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the slab tree got a conflict in
> fs/proc/inode.c between commit 5bcd7ff9e1690dbdbccb2a1cb3c2ea8b8381c435
> ("proc: proc_init_inodecache() can't fail") from Linus' tree and commit
> f7f650b4b85ad364072936db9e6beddcb2ca33b8 ("Filesystem: /proc filesystem
> support for slab defrag") from the slab tree.
>
> It is just a context change. I fixed it up (see below) and will carry the
> fix for a couple of days (during which time it will hopefully be fixed in
> your tree).
I fixed up this by rebasing the whole series to 2.6.28-rc3. Thanks!
next prev parent reply other threads:[~2008-11-03 9:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-03 4:07 linux-next: manual merge of the slab tree Stephen Rothwell
2008-11-03 9:38 ` Pekka Enberg [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-11-03 4:26 Stephen Rothwell
2008-11-03 9:39 ` Pekka Enberg
2008-11-03 4:19 Stephen Rothwell
2008-11-03 4:52 ` KOSAKI Motohiro
2008-11-03 9:39 ` Pekka Enberg
2008-10-21 4:55 Stephen Rothwell
2008-08-13 4:57 Stephen Rothwell
2008-08-13 6:19 ` Pekka Enberg
2008-08-13 7:11 ` Stephen Rothwell
2008-08-13 7:10 ` Pekka Enberg
2008-08-13 7:36 ` Stephen Rothwell
2008-08-13 7:21 ` Pekka Enberg
2008-08-13 7:40 ` 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=1225705140.22949.12.camel@penberg-laptop \
--to=penberg@cs.helsinki.fi \
--cc=adobriyan@gmail.com \
--cc=cl@linux-foundation.org \
--cc=linux-next@vger.kernel.org \
--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