linux-next: manual merge of the modules tree with the kbuild tree

2019-09-15 Thread Mark Brown
Hi all, Today's linux-next merge of the modules tree got a conflict in: scripts/Makefile.modpost between commit: 9b9a3f20cbe0ba ("kbuild: split final module linking out into Makefile.modfinal") from the kbuild tree and commit: eb8305aecb958e ("cripts: Coccinelle script for namespace de

linux-next: manual merge of the modules tree with the kbuild tree

2015-11-01 Thread Stephen Rothwell
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