linux-kernel - linux-next: manual merge of the arm-soc tree with the arm64 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20120924192545.09a1327b66005e0ac967faaf@canb.auug.org.au>
Date:	Mon, 24 Sep 2012 19:25:45 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Simon Arlott <simon@...e.lp0.eu>, Chris Boot <bootc@...tc.net>,
	Dom Cobley <popcornmix@...il.com>,
	Dom Cobley <dc4@...adcom.com>,
	Stephen Warren <swarren@...dotorg.org>,
	Marc Zyngier <marc.zyngier@....com>,
	Will Deacon <will.deacon@....com>,
	Catalin Marinas <catalin.marinas@....com>
Subject: linux-next: manual merge of the arm-soc tree with the arm64 tree

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@...b.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

Content of type "application/pgp-signature" skipped