From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org, Paul Mackerras <paulus@samba.org>
Subject: Fw: linux-next: manual merge of the rr tree with the powerpc tree
Date: Wed, 25 Mar 2009 15:33:33 +1100 [thread overview]
Message-ID: <20090325153333.8a245026.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1004 bytes --]
[Forgot the cc]
Begin forwarded message:
Date: Wed, 25 Mar 2009 15:08:17 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: linux-next@vger.kernel.org
Subject: linux-next: manual merge of the rr tree with the powerpc tree
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/powerpc/kernel/sysfs.c between commit
9a3719341a9b5d2f5a2e590497346b61cf3462a5 ("powerpc: Make sysfs code use
smp_call_function_single") from the powerpc tree and commits
a604eba6e6850d9d225cc5e983c29be78e629580
("cpumask:remove-cpumask-games-arch-powerpc-kernel-sysfs.c") and
40d45a4bf32db8c75f837caa72bf4bb2c1040597
("cpumask:smp_call_function-in-powerpc-sysfs") from the rr tree.
The former appears to be an earlier version of the latter two. I fixed
it up (using the rr tree version) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
reply other threads:[~2009-03-25 4:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20090325153333.8a245026.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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