From: Pekka Enberg <penberg@cs•helsinki.fi>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Nick Piggin <npiggin@suse•de>,
Christoph Lameter <cl@linux-foundation•org>,
Vegard Nossum <vegard.nossum@gmail•com>
Subject: Re: linux-next: manual merge of the tip tree with the slab tree
Date: Tue, 16 Jun 2009 08:48:38 +0300 [thread overview]
Message-ID: <1245131318.3415.1.camel@penberg-laptop> (raw)
In-Reply-To: <20090616154652.b8adcb9d.sfr@canb.auug.org.au>
On Tue, 2009-06-16 at 15:46 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in mm/slub.c
> between commit 964cf35c88f93b4927dbc4e950dfa4d880c7f9d1 ("SLUB: Fix early
> boot GFP_DMA allocations") from the slab tree and commit
> 18fd427debcf37c06917b55295df682fd05fee76 ("slub: add hooks for
> kmemcheck") from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good! Thanks.
next prev parent reply other threads:[~2009-06-16 5:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-16 5:46 linux-next: manual merge of the tip tree with the slab tree Stephen Rothwell
2009-06-16 5:48 ` Pekka Enberg [this message]
2009-06-16 7:44 ` Ingo Molnar
2009-06-16 7:46 ` Pekka Enberg
[not found] <20090706144051.06d079a5.sfr@canb.auug.org.au>
2009-07-06 8:01 ` Pekka Enberg
[not found] ` <20090914155219.13118819.sfr@canb.auug.org.au>
2009-09-14 6:35 ` Pekka Enberg
-- strict thread matches above, loose matches on Subject: below --
2010-09-23 3:44 Stephen Rothwell
2010-09-23 9:33 ` Pekka Enberg
2010-09-23 9:46 ` Tejun Heo
2012-06-21 3:48 Stephen Rothwell
2012-06-21 7:24 ` David Rientjes
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=1245131318.3415.1.camel@penberg-laptop \
--to=penberg@cs$(echo .)helsinki.fi \
--cc=cl@linux-foundation$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=npiggin@suse$(echo .)de \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
--cc=vegard.nossum@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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