From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Mackerras <paulus@samba•org>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
linuxppc-dev@ozlabs•org
Cc: linux-next@vger•kernel.org, Steven Rostedt <rostedt@goodmis•org>,
Mark Nelson <markn@au1•ibm.com>, Ingo Molnar <mingo@elte•hu>,
Thomas Gleixner <tglx@linutronix•de>
Subject: linux-next: manual merge of the powerpc tree
Date: Mon, 14 Jul 2008 15:44:59 +1000 [thread overview]
Message-ID: <20080714154459.0ed9da62.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 660 bytes --]
Hi Paul, Ben,
Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/Kconfig between commit
4e491d14f2506b218d678935c25a7027b79178b1 ("ftrace: support for PowerPC")
from the ftrace tree and commit 3affedc4e1ce837033b6c5e9289d2ce2f5a62d31
("powerpc/dma: implement new dma_*map*_attrs() interfaces") from the
powerpc tree.
The former commit moved the "select HAVE_OPROFILE" to the bottom of the
"config PPC" list (for no reason that I can fathom) while the latter
added another select. Simple fixup. I can carry it.
--
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:[~2008-07-14 5:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-14 5:44 Stephen Rothwell [this message]
2008-07-15 1:24 ` linux-next: manual merge of the powerpc tree Steven Rostedt
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 1:02 Stephen Rothwell
2008-10-14 1:02 Stephen Rothwell
2008-07-07 13:07 Stephen Rothwell
2008-07-07 21:13 ` Daniel Walker
2008-07-11 19:01 ` Bartlomiej Zolnierkiewicz
2008-07-12 3:41 ` Benjamin Herrenschmidt
2008-07-03 3:39 Stephen Rothwell
2008-07-03 5:47 ` Grant Likely
2008-07-03 12:22 ` Jon Smirl
2008-07-03 15:24 ` Grant Likely
2008-07-04 5:54 ` Grant Likely
2008-07-04 7:35 ` Jean Delvare
2008-07-01 6:48 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=20080714154459.0ed9da62.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=benh@kernel$(echo .)crashing.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=markn@au1$(echo .)ibm.com \
--cc=mingo@elte$(echo .)hu \
--cc=paulus@samba$(echo .)org \
--cc=rostedt@goodmis$(echo .)org \
--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