Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1307974
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the block tree with Linus' tree |
| Date | 2016-01-13 03:10 +0100 |
| Message-ID | <qQj2O-1jj-11@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
linux-next: manual merge of the block tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-13 03:10 +0100
csiph-web