From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 11 Jan 2016 01:14:11 +0000 (-0500)
Subject: uapi: update install list after nvme.h rename
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~3486
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1b6bb1931f63e6575240688ba96158d5a7afe97f;p=mirror_ubuntu-zesty-kernel.git

uapi: update install list after nvme.h rename

BugLink: http://bugs.launchpad.net/bugs/1553179

commit a9cf8284b45110a4d98aea180a89c857e53bf850 upstream.

Commit 9d99a8dda154 ("nvme: move hardware structures out of the uapi
version of nvme.h") renamed nvme.h to nvme_ioctl.h, but the uapi list
still refers to nvme.h.  People trying to install the headers hit a
failure as the header no longer exists.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---

diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index d736c11b6d19..32152e771c71 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -308,7 +308,7 @@ header-y += nfs_mount.h
 header-y += nl80211.h
 header-y += n_r3964.h
 header-y += nubus.h
-header-y += nvme.h
+header-y += nvme_ioctl.h
 header-y += nvram.h
 header-y += omap3isp.h
 header-y += omapfb.h