From c353d9e9f83eac43bf4f458b26d0fa7903ec50bf Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 14 Dec 2015 01:16:03 +0000 Subject: [PATCH] Fix reference to non-UAPI in include/uapi/linux/Kbuild --- ...ling-kernel-only-linux-nvme.h-as-uap.patch | 23 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 24 insertions(+) create mode 100644 debian/patches/nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch diff --git a/debian/patches/nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch b/debian/patches/nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch new file mode 100644 index 000000000..633b219e6 --- /dev/null +++ b/debian/patches/nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch @@ -0,0 +1,23 @@ +From: Ben Hutchings +Date: Mon, 14 Dec 2015 01:09:32 +0000 +Subject: nvme: Stop installing kernel-only as UAPI +Forwarded: http://mid.gmane.org/20151214011442.GL28542@decadent.org.uk + +Fixes: 9d99a8dda154 ("nvme: move hardware structures out of the uapi ...") +Signed-off-by: Ben Hutchings +--- + include/uapi/linux/Kbuild | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild +index 628e6e6..41652af 100644 +--- a/include/uapi/linux/Kbuild ++++ b/include/uapi/linux/Kbuild +@@ -306,7 +306,6 @@ header-y += nfs_mount.h + header-y += nl80211.h + header-y += n_r3964.h + header-y += nubus.h +-header-y += nvme.h + header-y += nvram.h + header-y += omap3isp.h + header-y += omapfb.h diff --git a/debian/patches/series b/debian/patches/series index c8eedbf7f..880f2ac05 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,3 +14,4 @@ tools-lib-lockdep-use-ldflags.patch tools-hv-fix-fortify-format-warning.patch revert-perf-build-fix-libunwind-feature-detection-on.patch alpha-uapi-add-support-for-__sane_userspace_types__.patch +nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch