linux-kernel - linux-next: manual merge of the imx-mxs tree with the arm-soc 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: <20130402175752.b6ff90247b873b67111d31ad@canb.auug.org.au>
Date:	Tue, 2 Apr 2013 17:57:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Shawn Guo <shawn.guo@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Subject: linux-next: manual merge of the imx-mxs tree with the arm-soc tree

Hi Shawn,

Today's linux-next merge of the imx-mxs tree got a conflict in
drivers/clocksource/Makefile between commit 275786b71d42 ("ARM: sirf: use
clocksource_of infrastructure") from the arm-soc tree and commit
c74512bf83f3 ("ARM: mxs: move timer driver into drivers/clocksource")
from the imx-mxs 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 5e2176f,89c5adc..0000000
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -16,8 -16,7 +16,9 @@@ obj-$(CONFIG_CLKSRC_NOMADIK_MTU)	+= nom
  obj-$(CONFIG_CLKSRC_DBX500_PRCMU)	+= clksrc-dbx500-prcmu.o
  obj-$(CONFIG_ARMADA_370_XP_TIMER)	+= time-armada-370-xp.o
  obj-$(CONFIG_ARCH_BCM2835)	+= bcm2835_timer.o
 +obj-$(CONFIG_ARCH_MARCO)	+= timer-marco.o
 +obj-$(CONFIG_ARCH_PRIMA2)	+= timer-prima2.o
+ obj-$(CONFIG_ARCH_MXS)		+= mxs_timer.o
  obj-$(CONFIG_SUNXI_TIMER)	+= sunxi_timer.o
  obj-$(CONFIG_ARCH_TEGRA)	+= tegra20_timer.o
  obj-$(CONFIG_VT8500_TIMER)	+= vt8500_timer.o

Content of type "application/pgp-signature" skipped