From: Ingo Molnar <mingo@elte•hu>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Vegard Nossum <vegard.nossum@gmail•com>,
Pekka Enberg <penberg@cs•helsinki.fi>,
linux-next@vger•kernel.org, Alexey Dobriyan <adobriyan@gmail•com>
Subject: Re: linux-next: manual merge of the kmemcheck tree
Date: Mon, 28 Jul 2008 11:06:35 +0200 [thread overview]
Message-ID: <20080728090635.GB5732@elte.hu> (raw)
In-Reply-To: <20080728140917.fd7769c3.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the kmemcheck tree got a conflict in
> mm/slab.c between commit 51cc50685a4275c6a02653670af9f108a64e01cf
> ("SL*B: drop kmem cache argument from constructor") from Linus' tree
> and commit c9506812f317bca0edcbc717c8fdabdd1d0a264b ("slab: move
> struct kmem_cache to headers") from the kmemcheck tree.
>
> The former changed the ctor field of the structure that the latter
> moved to a different file. I fixed it up in its new location.
Thanks Stephen. I have done the same merge fixup yesterday in tip/master
and pushed it out today into tip/auto-kmemcheck-next. The conflict
should disappear on your next integration run.
Ingo
next prev parent reply other threads:[~2008-07-28 9:06 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-28 4:09 linux-next: manual merge of the kmemcheck tree Stephen Rothwell
2008-07-28 9:06 ` Ingo Molnar [this message]
2008-07-28 17:19 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-12-30 12:18 Stephen Rothwell
2008-12-30 12:14 Stephen Rothwell
2008-10-28 5:14 Stephen Rothwell
2008-10-28 8:15 ` Ingo Molnar
2008-10-21 5:29 Stephen Rothwell
2008-10-21 7:32 ` Ingo Molnar
2008-10-21 8:07 ` Vegard Nossum
2008-10-21 8:28 ` Ingo Molnar
2008-10-21 5:15 Stephen Rothwell
2008-08-20 6:40 Stephen Rothwell
[not found] <20080815164909.3d8beb10.sfr@canb.auug.org.au>
2008-08-15 7:04 ` Vegard Nossum
2008-08-15 8:00 ` Stephen Rothwell
2008-08-15 6:45 Stephen Rothwell
2008-08-15 6:43 ` Pekka Enberg
2008-08-15 8:17 ` Ingo Molnar
2008-08-13 5:29 Stephen Rothwell
2008-08-13 7:32 ` Ingo Molnar
2008-08-13 7:31 ` Pekka Enberg
2008-08-13 7:58 ` Ingo Molnar
2008-08-13 8:14 ` Pekka Enberg
2008-08-13 8:58 ` Ingo Molnar
2008-08-13 11:37 ` Pekka Enberg
2008-08-13 11:52 ` Ingo Molnar
2008-08-13 11:57 ` Pekka Enberg
2008-08-13 12:05 ` Ingo Molnar
2008-08-13 7:41 ` Stephen Rothwell
2008-08-13 5:26 Stephen Rothwell
2008-08-13 5:22 Stephen Rothwell
2008-07-28 4:01 Stephen Rothwell
2008-07-28 9:05 ` Ingo Molnar
2008-07-28 9:17 ` Vegard Nossum
2008-07-28 9:29 ` Ingo Molnar
2008-07-22 6:16 Stephen Rothwell
2008-07-22 6:52 ` Ingo Molnar
2008-07-22 8:18 ` Stephen Rothwell
2008-07-21 6:47 Stephen Rothwell
2008-07-11 6:32 Stephen Rothwell
2008-07-03 6:19 Stephen Rothwell
2008-07-03 6:12 Stephen Rothwell
2008-07-03 6:26 ` Ingo Molnar
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=20080728090635.GB5732@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=adobriyan@gmail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=penberg@cs$(echo .)helsinki.fi \
--cc=sfr@canb$(echo .)auug.org.au \
--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