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,
Jaswinder Singh <jaswinder@infradead.org>
Subject: Re: linux-next: manual merge of the kmemcheck tree
Date: Tue, 22 Jul 2008 08:52:11 +0200 [thread overview]
Message-ID: <20080722065211.GA9639@elte.hu> (raw)
In-Reply-To: <20080722161619.5b8bd082.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 trivial conflict in
> arch/x86/kernel/traps_32.c between commit
> 6ac8d51f01d345af5ea4209004a9ea29b2f20891 ("x86: introducing
> asm-x86/traps.h") from Linus' tree and commit
> 787ecfaa503dc63ff1831ddc74b15dad49bace1d ("x86: add hooks for kmemcheck")
> from the kmemcheck tree.
>
> Just overlapping additions of includes. I can carry it.
thanks Stephen - i had this conflict fixup too in tip/master but not yet
in auto-kmemcheck-next. I've now propagated it so the conflict should go
away on your next integration run.
Ingo
next prev parent reply other threads:[~2008-07-22 6:52 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-22 6:16 linux-next: manual merge of the kmemcheck tree Stephen Rothwell
2008-07-22 6:52 ` Ingo Molnar [this message]
2008-07-22 8:18 ` 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:09 Stephen Rothwell
2008-07-28 9:06 ` Ingo Molnar
2008-07-28 17:19 ` 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-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=20080722065211.GA9639@elte.hu \
--to=mingo@elte.hu \
--cc=jaswinder@infradead.org \
--cc=linux-next@vger.kernel.org \
--cc=penberg@cs.helsinki.fi \
--cc=sfr@canb.auug.org.au \
--cc=vegard.nossum@gmail.com \
/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.