From: Robert Richter <robert.richter@amd•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Rusty Russell <rusty@rustcorp•com.au>,
linux-next@vger•kernel.org, Russell King <rmk@arm•linux.org.uk>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Subject: Re: linux-next: manual merge of the rr tree with the cpus4096 tree
Date: Tue, 31 Mar 2009 11:42:31 +0200 [thread overview]
Message-ID: <20090331094230.GK7030@erda.amd.com> (raw)
In-Reply-To: <20090331133953.73d33570.sfr@canb.auug.org.au>
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: robert.richter@amd•com
next prev parent reply other threads:[~2009-03-31 9:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-31 2:39 linux-next: manual merge of the rr tree with the cpus4096 tree Stephen Rothwell
2009-03-31 9:42 ` Robert Richter [this message]
2009-04-03 17:23 ` Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2009-03-19 5:49 Stephen Rothwell
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=20090331094230.GK7030@erda.amd.com \
--to=robert.richter@amd$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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