Hi all, Today's linux-next merge of the kapi tree got a conflict in: kernel/Makefile between commit: b6ac4f250ef00 ("module: Add stubs.c for CONFIG_MODULES=n module_put_and_kthread_exit()") from the modules tree and commit: ce4c52682d78f ("kernel/api: introduce kernel API specification framework") from the kapi 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. diff --cc kernel/Makefile index bfa7ecfd07d82,7fd43127d5eee..0000000000000 --- a/kernel/Makefile +++ b/kernel/Makefile @@@ -58,7 -58,8 +58,8 @@@ obj-y += liveupdate obj-y += dma/ obj-y += entry/ obj-y += unwind/ -obj-$(CONFIG_MODULES) += module/ +obj-y += module/ + obj-$(CONFIG_KAPI_SPEC) += api/ obj-$(CONFIG_KCMP) += kcmp.o obj-$(CONFIG_FREEZER) += freezer.o