linux-next: manual merge of the block tree with Linus' tree
From: Stephen Rothwell <hidden>
Date: 2016-01-13 02:08:08
Also in:
lkml
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
drivers/nvme/host/Makefile
between commit:
c4699e70d1db ("lightnvm: Simplify config when disabled")
from Linus' tree and commit:
21d34711e1b5 ("nvme: split command submission helpers out of pci.c")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/nvme/host/Makefile
index a5fe23952586,baf9f52bbfa5..000000000000--- a/drivers/nvme/host/Makefile
+++ b/drivers/nvme/host/Makefile@@@ -1,5 -1,5 +1,6 @@@ obj-$(CONFIG_BLK_DEV_NVME) += nvme.o - lightnvm-$(CONFIG_NVM) := lightnvm.o - nvme-y += pci.o scsi.o $(lightnvm-y) -nvme-y += core.o pci.o lightnvm.o ++lightnvm-$(CONFIG_NVM) := lightnvm.o ++nvme-y += core.o pci.o $(lightnvm-y) + nvme-$(CONFIG_BLK_DEV_NVME_SCSI) += scsi.o