Subject: Re: linux-next: manual merge of the rr tree with the cpus4096 tree

From: Robert Richter <[email-masked]>
Date: Tue, 31 Mar 2009 11:42:31 +0200

On 31.03.09 13:39:53, Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next merge of the rr tree got a conflict in
> drivers/oprofile/buffer_sync.c between commit
> 4c50d9ea9ca9e46b65aeffed3e0d6f54ff38c8d4 ("cpumask: modifiy oprofile
> initialization") from the cpus4096 tree and commit
> d6d66104b6a06bc0bb541ac59aff59fad46ad466 ("oprofile: Thou shalt not call
> __exit functions from __init functions") from the rr tree.
> 
> The former just removed the code that the latter was modifying, so I used
> the former version.

Rusty,

please revert d6d66104b6a06bc0bb541ac59aff59fad46ad466. The
tip/cpus4096 branch has been pulled incompletely. Patch
4c50d9ea9ca9e46b65aeffed3e0d6f54ff38c8d4 fixes the section mismatch.

Ingo,

will you send a pull request for tip/cpus4096? Otherwise the patch
should be added to the urgent branch or so.

Thanks,

-Robert

-- 
Advanced Micro Devices, Inc.
Operating System Research Center
email: [email-masked]