Subject: Re: linux-next: rr/x86 merge conflict

From: Rusty Russell <[email-masked]>
Date: Mon, 19 May 2008 16:50:20 +1000

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.