]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: bfc71eb) | patch
Revert "nvme: move to a new drivers/nvme/host directory"
authorAshok Vairavan <ashok.vairavan@oracle.com>
Sat, 17 Dec 2016 03:23:09 +0000 (19:23 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 1 Jun 2017 20:40:26 +0000 (13:40 -0700)
commited2f0aa56435bc3deb80d9964d4f70ed42ed42b2
tree6bb169c79bb7cd5eb2691045c8bec2d80de9271ftree
parentbfc71eb5cffd0fb058dca40b6268c710c51b9abfcommit | diff
Revert "nvme: move to a new drivers/nvme/host directory"

This reverts commit 57dacad5f2288e3de91f99b29f07b4a2793446d2. We need to
cherry-pick many commits before merging this commit. Hence this commit
is reverted to cherry-pick the commits from upstream.

Orabug: 25130845
Conflicts:
        drivers/nvme/host/Kconfig

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
12 files changed:
MAINTAINERS diff | blob | history
drivers/Kconfig diff | blob | history
drivers/Makefile diff | blob | history
drivers/block/Kconfig diff | blob | history
drivers/block/Makefile diff | blob | history
drivers/block/nvme-core.c [moved from drivers/nvme/host/pci.c with 100% similarity] blob | history
drivers/block/nvme-scsi.c [moved from drivers/nvme/host/scsi.c with 100% similarity] blob | history
drivers/block/nvme.h [moved from drivers/nvme/host/nvme.h with 100% similarity] blob | history
drivers/nvme/Kconfig [deleted file] blob | history
drivers/nvme/Makefile [deleted file] blob | history
drivers/nvme/host/Kconfig [deleted file] blob | history
drivers/nvme/host/Makefile [deleted file] blob | history
Unnamed repository; edit this file 'description' to name the repository.