From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Simon Arlott <simon@fire.lp0.eu>, Chris Boot <bootc@bootc.net>,
Dom Cobley <popcornmix@gmail.com>, Dom Cobley <dc4@broadcom.com>,
Stephen Warren <swarren@wwwdotorg.org>,
Marc Zyngier <marc.zyngier@arm.com>,
Will Deacon <will.deacon@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>
Subject: linux-next: manual merge of the arm-soc tree with the arm64 tree
Date: Mon, 24 Sep 2012 19:25:45 +1000 [thread overview]
Message-ID: <20120924192545.09a1327b66005e0ac967faaf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 927 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/clocksource/Makefile between commit 985c0679dfa4 ("arm64: Generic
timers support") from the arm64 tree and commit ee4af5696720 ("ARM:
bcm2835: add system timer") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/clocksource/Makefile
index 6591990,d496a55..0000000
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -13,4 -13,4 +13,5 @@@ obj-$(CONFIG_DW_APB_TIMER) += dw_apb_ti
obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o
obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.o
obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o
+obj-$(CONFIG_CLKSRC_ARM_GENERIC) += arm_generic.o
+ obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-09-24 9:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 9:25 Stephen Rothwell [this message]
2012-10-05 3:32 Stephen Rothwell
2019-02-28 22:10 Stephen Rothwell
2019-03-01 10:58 ` Catalin Marinas
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=20120924192545.09a1327b66005e0ac967faaf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=bootc@bootc.net \
--cc=catalin.marinas@arm.com \
--cc=dc4@broadcom.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=olof@lixom.net \
--cc=popcornmix@gmail.com \
--cc=simon@fire.lp0.eu \
--cc=swarren@wwwdotorg.org \
--cc=will.deacon@arm.com \
/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
all inboxes | Powered by JetHome®