From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rusty Russell <rusty@rustcorp•com.au>
Cc: linux-next@vger•kernel.org, Russell King <rmk@arm•linux.org.uk>,
Robert Richter <robert.richter@amd•com>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Subject: linux-next: manual merge of the rr tree with the cpus4096 tree
Date: Tue, 31 Mar 2009 13:39:53 +1100 [thread overview]
Message-ID: <20090331133953.73d33570.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-03-31 2:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-31 2:39 Stephen Rothwell [this message]
2009-03-31 9:42 ` linux-next: manual merge of the rr tree with the cpus4096 tree Robert Richter
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=20090331133953.73d33570.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--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=robert.richter@amd$(echo .)com \
--cc=rusty@rustcorp$(echo .)com.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