Messages in this thread | | | Date | Thu, 7 Jun 2018 14:19:04 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the nvdimm tree with the tip tree |
| |
Hi all,
Today's linux-next merge of the nvdimm tree got a conflict in:
kernel/Makefile
between commit:
d7822b1e24f2 ("rseq: Introduce restartable sequences system call")
from the tip tree and commit:
5981690ddb8f ("memremap: split devm_memremap_pages() and memremap() infrastructure")
from the nvdimm 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 kernel/Makefile index 7085c841c413,9b9241361311..000000000000 --- a/kernel/Makefile +++ b/kernel/Makefile @@@ -112,8 -112,8 +112,9 @@@ obj-$(CONFIG_JUMP_LABEL) += jump_label. obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o obj-$(CONFIG_TORTURE_TEST) += torture.o - obj-$(CONFIG_HAS_IOMEM) += memremap.o + obj-$(CONFIG_HAS_IOMEM) += iomem.o + obj-$(CONFIG_ZONE_DEVICE) += memremap.o +obj-$(CONFIG_RSEQ) += rseq.o $(obj)/configs.o: $(obj)/config_data.h [unhandled content-type:application/pgp-signature] | |