* linux-next: rr/x86 merge conflict
@ 2008-05-19 5:03 Stephen Rothwell
2008-05-19 6:50 ` Rusty Russell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2008-05-19 5:03 UTC (permalink / raw)
To: Rusty Russell, Ingo Molnar; +Cc: linux-next, Mathieu Desnoyers, Jason Baron
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: rr/x86 merge conflict
2008-05-19 5:03 linux-next: rr/x86 merge conflict Stephen Rothwell
@ 2008-05-19 6:50 ` Rusty Russell
0 siblings, 0 replies; 2+ messages in thread
From: Rusty Russell @ 2008-05-19 6:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Ingo Molnar, linux-next, Mathieu Desnoyers, Jason Baron
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-05-19 6:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-19 5:03 linux-next: rr/x86 merge conflict Stephen Rothwell
2008-05-19 6:50 ` Rusty Russell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).