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: Wed, 28 Jul 2010 14:35:14 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Guennadi Liakhovetski <g.liakhovetski@....de>, Paul Mundt <lethal@...ux-sh.org>, John Stultz <johnstul@...ibm.com> Subject: linux-next: manual merge of the tip tree with the sh tree Hi all, Today's linux-next merge of the tip tree got a conflict in drivers/Makefile between commit ae9b12c72f831a2f956a5b30fd999f3018c43a89 ("dmaengine: initialise DMA engine before MMC") from the sh tree and commit 592913ecb87a9e06f98ddb55b298f1a66bf94c6b ("time: Kill off CONFIG_GENERIC_TIME") from the tip tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@...b.auug.org.au diff --cc drivers/Makefile index 20dcced,ae47344..0000000 --- a/drivers/Makefile +++ b/drivers/Makefile @@@ -102,7 -101,10 +102,9 @@@ obj-y += firmware obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_SUPERH) += sh/ obj-$(CONFIG_ARCH_SHMOBILE) += sh/ - obj-$(CONFIG_GENERIC_TIME) += clocksource/ + ifndef CONFIG_ARCH_USES_GETTIMEOFFSET + obj-y += clocksource/ + endif -obj-$(CONFIG_DMA_ENGINE) += dma/ obj-$(CONFIG_DCA) += dca/ obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_PPC_PS3) += ps3/ -- 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