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: Sun, 1 Nov 2015 19:31:10 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Rusty Russell <rusty@...tcorp.com.au>, Michal Marek <mmarek@...e.cz> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Nicolas Boichat <drinkcat@...omium.org>, Andi Kleen <ak@...ux.intel.com> Subject: linux-next: manual merge of the modules tree with the kbuild tree Hi Rusty, Today's linux-next merge of the modules tree got a conflict in: scripts/Makefile.modpost between commit: 19a3cc83353e ("Kbuild, lto: Add Link Time Optimization support v3") from the kbuild tree and commit: 47490ec141b9 ("modpost: Add flag -E for making section mismatches fatal") from the modules 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 scripts/Makefile.modpost index 9c40daea846c,1366a94b6c39..000000000000 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@@ -77,8 -77,8 +77,9 @@@ modpost = scripts/mod/modpos $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \ $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \ + $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ - $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) + $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \ + $(if $(CONFIG_LTO),-w) MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS))) -- 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