From: "Vegard Nossum" <vegard.nossum@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Pekka Enberg <penberg@cs•helsinki.fi>,
Ingo Molnar <mingo@elte•hu>,
linux-next@vger•kernel.org,
"Gustavo F. Padovan" <gustavo@las•ic.unicamp.br>
Subject: Re: linux-next: manual merge of the kmemcheck tree
Date: Fri, 15 Aug 2008 09:04:08 +0200 [thread overview]
Message-ID: <19f34abd0808150004ma79af8ei9009a792b87a4c80@mail.gmail.com> (raw)
In-Reply-To: <20080815164909.3d8beb10.sfr@canb.auug.org.au>
On Fri, Aug 15, 2008 at 8:49 AM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the kmemcheck tree got a conflict in
> arch/x86/kernel/traps_64.c between commit
> 4df9e510a9fda29aca71d8acac853b98aa6884d1 ("x86: coding style fixes to
> arch/x86/kernel/traps_64.c") from the x86 tree and commit
> 862849a36e6087faac6349de0b1bcc66ff98411b ("x86: add hooks for kmemcheck
> on x86_64") from the kmemcheck tree.
>
> All the includes got rearranged ... I fixed it up.
Hi Stephen,
Just out of curiosity: Do you have a script that produces these
messages? How hard would it be to include the "merge patch" (conflict
resolution) itself in this e-mail?
I think that would be a very helpful addition (if it can be done with
no hassle on your side), because it means that I could actually look
over it and give a comment if it looks wrong (with no hassle on my
side, looking up the merge commit, etc.).
But if it can't be done easily, then don't bother. The issues are
mostly trivial anyway. Thanks for doing this work!
Vegard
--
"The animistic metaphor of the bug that maliciously sneaked in while
the programmer was not looking is intellectually dishonest as it
disguises that the error is the programmer's own creation."
-- E. W. Dijkstra, EWD1036
next parent reply other threads:[~2008-08-15 7:04 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20080815164909.3d8beb10.sfr@canb.auug.org.au>
2008-08-15 7:04 ` Vegard Nossum [this message]
2008-08-15 8:00 ` linux-next: manual merge of the kmemcheck tree Stephen Rothwell
2008-12-30 12:18 Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
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
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-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=19f34abd0808150004ma79af8ei9009a792b87a4c80@mail.gmail.com \
--to=vegard.nossum@gmail$(echo .)com \
--cc=gustavo@las$(echo .)ic.unicamp.br \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=penberg@cs$(echo .)helsinki.fi \
--cc=sfr@canb$(echo .)auug.org.au \
/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