From 672002c87d3b969328359938ad9dbe7d5074dfff Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Thu, 18 Dec 2014 13:36:25 -0500
Subject: [PATCH] Fix from Kyle McMartin for target_core_user uapi issue since
 it's enabled

---
 kernel.spec                                   |  5 +++
 ...t_core_user.h-fix-headers_install.sh.patch | 36 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 uapi-linux-target_core_user.h-fix-headers_install.sh.patch

diff --git a/kernel.spec b/kernel.spec
index f76d75fe1..764869485 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -643,6 +643,8 @@ Patch26104: dm-cache-only-use-overwrite-optimisation-for-promoti.patch
 Patch26105: dm-cache-dirty-flag-was-mistakenly-being-cleared-whe.patch
 Patch26106: dm-cache-fix-spurious-cell_defer-when-dealing-with-p.patch
 
+Patch26107: uapi-linux-target_core_user.h-fix-headers_install.sh.patch
+
 # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
 Patch30000: kernel-arm64.patch
 
@@ -1394,6 +1396,8 @@ ApplyPatch dm-cache-only-use-overwrite-optimisation-for-promoti.patch
 ApplyPatch dm-cache-dirty-flag-was-mistakenly-being-cleared-whe.patch
 ApplyPatch dm-cache-fix-spurious-cell_defer-when-dealing-with-p.patch
 
+ApplyPatch uapi-linux-target_core_user.h-fix-headers_install.sh.patch
+
 %if 0%{?aarch64patches}
 ApplyPatch kernel-arm64.patch
 %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2263,6 +2267,7 @@ fi
 #                                    ||     ||
 %changelog
 * Thu Dec 18 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix from Kyle McMartin for target_core_user uapi issue since it's enabled
 - Fix dm-cache crash (rhbz 1168434)
 - Fix blk-mq crash on CPU hotplug (rhbz 1175261)
 
diff --git a/uapi-linux-target_core_user.h-fix-headers_install.sh.patch b/uapi-linux-target_core_user.h-fix-headers_install.sh.patch
new file mode 100644
index 000000000..516d10f8a
--- /dev/null
+++ b/uapi-linux-target_core_user.h-fix-headers_install.sh.patch
@@ -0,0 +1,36 @@
+From: Kyle McMartin <kyle@redhat.com>
+Date: Thu, 18 Dec 2014 12:57:14 -0500
+Subject: [PATCH] uapi/linux/target_core_user.h: fix headers_install.sh badness
+
+scripts/headers_install.sh will transform __packed to
+__attribute__((packed)), so the #ifndef is not necessary.
+(and, in fact, it's problematic, because we'll end up with the header
+ containing:
+#ifndef __attribute__((packed))
+#define __attribu...
+and so forth.)
+
+Cc: stable@vger.kernel.org # 3.18
+Signed-off-by: Kyle McMartin <kyle@redhat.com>
+---
+ include/uapi/linux/target_core_user.h | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/include/uapi/linux/target_core_user.h b/include/uapi/linux/target_core_user.h
+index 7dcfbe6771b1..b483d1909d3e 100644
+--- a/include/uapi/linux/target_core_user.h
++++ b/include/uapi/linux/target_core_user.h
+@@ -6,10 +6,6 @@
+ #include <linux/types.h>
+ #include <linux/uio.h>
+ 
+-#ifndef __packed
+-#define __packed                        __attribute__((packed))
+-#endif
+-
+ #define TCMU_VERSION "1.0"
+ 
+ /*
+-- 
+2.1.0
+