| 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
| ||
|
Date: Mon, 16 Dec 2013 10:47:38 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Simon Horman <horms@...ge.net.au>, 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,
Boris BREZILLON <b.brezillon@...rkiz.com>,
Nicolas Ferre <nicolas.ferre@...el.com>,
Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com>,
Mike Turquette <mturquette@...aro.org>
Subject: linux-next: manual merge of the renesas tree with the arm-soc tree
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in
drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
base support") from the arm-soc tree and commit 10cdfe9f327a ("clk:
shmobile: Add R-Car Gen2 clocks support") from the renesas 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/clk/Makefile
index ace7309c4369,8dd1339be98b..000000000000
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -35,7 -35,7 +35,8 @@@ obj-$(CONFIG_ARCH_TEGRA) += tegra
obj-$(CONFIG_PLAT_SAMSUNG) += samsung/
obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o
obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/
+obj-$(CONFIG_COMMON_CLK_AT91) += at91/
+ obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile/
obj-$(CONFIG_X86) += x86/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists