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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 17 Feb 2017 15:53:21 +1100 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, Jinbum Park <jinb.park7@...il.com>, Laura Abbott <labbott@...hat.com> Subject: linux-next: manual merge of the akpm-current tree with the kspp tree Hi all, Today's linux-next merge of the akpm-current tree got conflicts in: arch/x86/Kconfig.debug arch/x86/kernel/Makefile between commits: ad21fc4faa2a ("arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common") 3ad38ceb2769 ("x86/mm: Remove CONFIG_DEBUG_NX_TEST") from the kspp tree and commit: ae4aea38de49 ("mm: add arch-independent testcases for RODATA") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/x86/Kconfig.debug index c4cba00dbdee,3fa469c82707..000000000000 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug diff --cc arch/x86/kernel/Makefile index bdcdb3b3a219,f6caf829085a..000000000000 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@@ -100,7 -100,7 +100,6 @@@ obj-$(CONFIG_HPET_TIMER) += hpet. obj-$(CONFIG_APB_TIMER) += apb_timer.o obj-$(CONFIG_AMD_NB) += amd_nb.o - obj-$(CONFIG_DEBUG_RODATA_TEST) += test_rodata.o -obj-$(CONFIG_DEBUG_NX_TEST) += test_nx.o obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o obj-$(CONFIG_KVM_GUEST) += kvm.o kvmclock.o
Powered by blists - more mailing lists