From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Guennadi Liakhovetski <g.liakhovetski@gmx•de>,
Paul Mundt <lethal@linux-sh•org>,
John Stultz <johnstul@us•ibm.com>
Subject: linux-next: manual merge of the tip tree with the sh tree
Date: Wed, 28 Jul 2010 14:35:14 +1000 [thread overview]
Message-ID: <20100728143514.faa6db31.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/Makefile between commit ae9b12c72f831a2f956a5b30fd999f3018c43a89
("dmaengine: initialise DMA engine before MMC") from the sh tree and
commit 592913ecb87a9e06f98ddb55b298f1a66bf94c6b ("time: Kill off
CONFIG_GENERIC_TIME") from the tip tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/Makefile
index 20dcced,ae47344..0000000
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -102,7 -101,10 +102,9 @@@ obj-y += firmware
obj-$(CONFIG_CRYPTO) += crypto/
obj-$(CONFIG_SUPERH) += sh/
obj-$(CONFIG_ARCH_SHMOBILE) += sh/
- obj-$(CONFIG_GENERIC_TIME) += clocksource/
+ ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
+ obj-y += clocksource/
+ endif
-obj-$(CONFIG_DMA_ENGINE) += dma/
obj-$(CONFIG_DCA) += dca/
obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/
next reply other threads:[~2010-07-28 4:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-28 4:35 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-10-14 2:19 linux-next: manual merge of the tip tree with the sh tree Stephen Rothwell
2016-07-24 5:13 Stephen Rothwell
2016-07-25 3:55 ` Rich Felker
2016-07-25 4:16 ` Stephen Rothwell
2016-07-25 22:30 ` 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=20100728143514.faa6db31.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=g.liakhovetski@gmx$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=johnstul@us$(echo .)ibm.com \
--cc=lethal@linux-sh$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(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