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, 27 Jul 2015 14:02:54 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Mike Turquette <mturquette@...aro.org>, Stephen Boyd <sboyd@...eaurora.org>, Tony Lindgren <tony@...mide.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Tero Kristo <t-kristo@...com> Subject: linux-next: manual merge of the clk tree with the omap tree Hi all, Today's linux-next merge of the clk tree got a conflict in: drivers/clk/ti/Makefile between commit: 9cf705de06a2 ("ARM: OMAP2+: Add support for initializing dm814x clocks") from the omap tree and commit: 0565fb168d63 ("clk: ti: dpll: move omap3 DPLL functionality to clock driver") from the clk 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/ti/Makefile index 80b42884a0e9,9b93e6904359..000000000000 --- a/drivers/clk/ti/Makefile +++ b/drivers/clk/ti/Makefile @@@ -1,16 -1,19 +1,19 @@@ obj-y += clk.o autoidle.o clockdomain.o clk-common = dpll.o composite.o divider.o gate.o \ - fixed-factor.o mux.o apll.o - obj-$(CONFIG_SOC_AM33XX) += $(clk-common) clk-33xx.o + fixed-factor.o mux.o apll.o \ + clkt_dpll.o clkt_iclk.o clkt_dflt.o + obj-$(CONFIG_SOC_AM33XX) += $(clk-common) clk-33xx.o dpll3xxx.o -obj-$(CONFIG_SOC_TI81XX) += $(clk-common) fapll.o clk-816x.o +obj-$(CONFIG_SOC_TI81XX) += $(clk-common) fapll.o clk-814x.o clk-816x.o obj-$(CONFIG_ARCH_OMAP2) += $(clk-common) interface.o clk-2xxx.o obj-$(CONFIG_ARCH_OMAP3) += $(clk-common) interface.o \ - clk-3xxx.o - obj-$(CONFIG_ARCH_OMAP4) += $(clk-common) clk-44xx.o - obj-$(CONFIG_SOC_OMAP5) += $(clk-common) clk-54xx.o + clk-3xxx.o dpll3xxx.o + obj-$(CONFIG_ARCH_OMAP4) += $(clk-common) clk-44xx.o \ + dpll3xxx.o dpll44xx.o + obj-$(CONFIG_SOC_OMAP5) += $(clk-common) clk-54xx.o \ + dpll3xxx.o dpll44xx.o obj-$(CONFIG_SOC_DRA7XX) += $(clk-common) clk-7xx.o \ - clk-dra7-atl.o - obj-$(CONFIG_SOC_AM43XX) += $(clk-common) clk-43xx.o + clk-dra7-atl.o dpll3xxx.o dpll44xx.o + obj-$(CONFIG_SOC_AM43XX) += $(clk-common) dpll3xxx.o clk-43xx.o ifdef CONFIG_ATAGS obj-$(CONFIG_ARCH_OMAP3) += clk-3xxx-legacy.o -- 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