| 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
| ||
|
Message-Id: <1381328067-1593-3-git-send-email-treding@nvidia.com> Date: Wed, 9 Oct 2013 16:14:24 +0200 From: Thierry Reding <thierry.reding@...il.com> To: Mike Turquette <mturquette@...aro.org>, Takashi Yoshii <takasi-y@....dti.ne.jp>, Simon Horman <horms+renesas@...ge.net.au>, Santosh Shilimkar <santosh.shilimkar@...com>, Loc Ho <lho@....com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: linux-next: manual merge of the clk tree Today's linux-next merge of the clk tree got a conflict in drivers/clk/Makefile caused by commits f00578d (clk: emev2: Add support for emev2 SMU clocks with DT), 6cfc229 (clk: keystone: Build Keystone clock drivers) and 308964c (clk: Add APM X-Gene SoC clock driver). I fixed it up (see below). Please verify that the resolution looks good. Thanks, Thierry --- diff --cc drivers/clk/Makefile index d25da26,df33820..fe3121b --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@@ -32,7 -32,8 +32,9 @@@ obj-$(CONFIG_ARCH_VT8500) += clk-vt8500 obj-$(CONFIG_ARCH_ZYNQ) += zynq/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ +obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile/ + obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o + obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/ obj-$(CONFIG_X86) += x86/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists