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, 2 Nov 2015 01:35:22 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Mike Turquette <mturquette@...libre.com>, Stephen Boyd <sboyd@...eaurora.org>, Scott Wood <scottwood@...escale.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Javier Martinez Canillas <javier@....samsung.com> Subject: linux-next: manual merge of the clk tree with the fsl tree Hi all, Today's linux-next merge of the clk tree got a conflict in: drivers/clk/Kconfig between commit: 9e19ca2f627e ("clk: qoriq: Add ls2080a support.") from the fsl tree and commit: 4a7748c3d641 ("clk: Allow drivers to build if COMPILE_TEST is enabled") 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/Kconfig index 67826167a0e0,57316528e924..000000000000 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@@ -131,7 -132,7 +142,7 @@@ config COMMON_CLK_AXI_CLKGE config CLK_QORIQ bool "Clock driver for Freescale QorIQ platforms" - depends on (PPC_E500MC || ARM || ARM64) && OF - depends on (PPC_E500MC || ARM || COMPILE_TEST) && OF ++ depends on (PPC_E500MC || ARM || ARM64 || COMPILE_TEST) && OF ---help--- This adds the clock driver support for Freescale QorIQ platforms using common clock framework. -- 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