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, 20 Jul 2015 13:54:39 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Andrew Morton <akpm@...ux-foundation.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Ingo Molnar <mingo@...nel.org>, Mel Gorman <mgorman@...e.de> Subject: linux-next: manual merge of the akpm-current tree with Linus' tree Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/x86/Kconfig between commit: 5aaeb5c01c5b ("x86/fpu, sched: Introduce CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT and use it on x86") from Linus' tree and commit: caf50fadb4de ("mm: send one IPI per CPU to TLB flush all entries after unmapping pages") from the akpm-current 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 arch/x86/Kconfig index 6c80c03d8e90,d9a83b54d86a..000000000000 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@@ -41,7 -41,7 +41,8 @@@ config X8 select ARCH_USE_CMPXCHG_LOCKREF if X86_64 select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS + select ARCH_WANTS_DYNAMIC_TASK_STRUCT + select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if SMP select ARCH_WANT_FRAME_POINTERS select ARCH_WANT_IPC_PARSE_VERSION if X86_32 select ARCH_WANT_OPTIONAL_GPIOLIB -- 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