| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20151207151636.0ef047f0@canb.auug.org.au>
Date: Mon, 7 Dec 2015 15:16:36 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jens Axboe <axboe@...nel.dk>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Keith Busch <keith.busch@...el.com>,
Matias Bjørling <m@...rling.me>,
Christoph Hellwig <hch@....de>
Subject: linux-next: manual merge of the block tree with Linus' tree
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@...b.auug.org.au
diff --cc drivers/nvme/host/Makefile
index a5fe23952586,3e26dc921c38..000000000000
--- a/drivers/nvme/host/Makefile
+++ b/drivers/nvme/host/Makefile
@@@ -1,5 -1,4 +1,5 @@@
obj-$(CONFIG_BLK_DEV_NVME) += nvme.o
-nvme-y += core.o pci.o scsi.o lightnvm.o
+lightnvm-$(CONFIG_NVM) := lightnvm.o
- nvme-y += pci.o scsi.o $(lightnvm-y)
++nvme-y += core.o pci.o scsi.o $(lightnvm-y)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists