From: Rusty Russell <rusty@rustcorp.com.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ingo Molnar <mingo@elte.hu>,
linux-next@vger.kernel.org,
Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>,
Jason Baron <jbaron@redhat.com>
Subject: Re: linux-next: rr/x86 merge conflict
Date: Mon, 19 May 2008 16:50:20 +1000 [thread overview]
Message-ID: <200805191650.20903.rusty@rustcorp.com.au> (raw)
In-Reply-To: <20080519150328.5913fd84.sfr@canb.auug.org.au>
On Monday 19 May 2008 15:03:28 Stephen Rothwell wrote:
> Hi Rusty, Ingo,
>
> Today's linux-next merge of the rr tree got conflicts in
> kernel/stop_machine.c and include/linux/stop_machine.h because commit
> 069d5b32bfe605bd78c2f8b2ee6c63a776592867 from the rr tree and commit
> 931aa4ee2f3b833e7a0a149126cc92596f7907c6 from the x86 tree ("Add all cpus
> option to stop machine run") are essentially the same (though they are
> attributed to different authors). The problem lies in that the rr tree
> then has a few more commits that change those files.
>
> I took the versions from the rr tree.
That's the correct solution: Matheiu forgot the From line.
Cheers,
Rusty.
prev parent reply other threads:[~2008-05-19 6:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-19 5:03 linux-next: rr/x86 merge conflict Stephen Rothwell
2008-05-19 6:50 ` Rusty Russell [this message]
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=200805191650.20903.rusty@rustcorp.com.au \
--to=rusty@rustcorp.com.au \
--cc=jbaron@redhat.com \
--cc=linux-next@vger.kernel.org \
--cc=mathieu.desnoyers@polymtl.ca \
--cc=mingo@elte.hu \
--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 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.