From 9ece5279ad280ac06512a94e1a05fc58611cf5a0 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Fri, 8 May 2020 15:23:43 +0000
Subject: [PATCH 1/2] Add the qla2x00t-32gbit/trace/events/qla.h file to the
 output of scripts/generate-kernel-patch

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8876 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t-32gbit/extract-qla2xxx-orig     |  7 ++++++-
 qla2x00t-32gbit/generate-in-tree-patches | 13 +++++++++++++
 scripts/generate-kernel-patch            |  6 +++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/qla2x00t-32gbit/extract-qla2xxx-orig b/qla2x00t-32gbit/extract-qla2xxx-orig
index ac9d5f0b4..3e41f29eb 100755
--- a/qla2x00t-32gbit/extract-qla2xxx-orig
+++ b/qla2x00t-32gbit/extract-qla2xxx-orig
@@ -18,7 +18,12 @@ cd qla2xxx-orig || exit $?
 download_and_extract_kernel_tree "${kernel_version}"
 touch "linux-${kernel_version}"/drivers/scsi/qla2xxx/*
 rm -rf "${kernel_version}"
-mkdir -p "${kernel_version}"
+mkdir -p "${kernel_version}/trace/events"
 mv "linux-${kernel_version}"/drivers/scsi/qla2xxx/* "${kernel_version}"
+if [ -e "linux-${kernel_version}"/trace/events/qla.h ]; then
+    touch "linux-${kernel_version}"/trace/events/qla.h
+    mv "linux-${kernel_version}"/trace/events/qla.h \
+       "${kernel_version}/trace/events"
+fi
 rm -rf "linux-${kernel_version}"
 cd ..
diff --git a/qla2x00t-32gbit/generate-in-tree-patches b/qla2x00t-32gbit/generate-in-tree-patches
index 239484e8a..73faf5518 100755
--- a/qla2x00t-32gbit/generate-in-tree-patches
+++ b/qla2x00t-32gbit/generate-in-tree-patches
@@ -26,6 +26,19 @@ for g in Kconfig *.[ch]; do
   fi
 done
 
+for g in trace/events/qla.h; do
+  f1="qla2xxx-orig/${kernel_version}/$g"
+  f2="$g"
+  f3="in-tree-patches/${kernel_version}/${g#trace/events/}.patch"
+  if [ "$f1" -nt "$f3" -o "$f2" -nt "$f3" ]; then
+    if [ -e "$f1" ]; then
+      diff -up "$f1" "$f2" > "$f3"
+    else
+      diff -up /dev/null "$f2" > "$f3"
+    fi
+  fi
+done
+
 for g in Makefile; do
   f1="qla2xxx-orig/${kernel_version}/$g"
   f2="${g}_in-tree"
diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index 9391f413e..1d44badf5 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -539,7 +539,11 @@ elif [ "${qla2x00t_32gbit}" = "true" ]; then
     [ -e "$f" ] || continue
     g="${f#qla2x00t-32gbit/in-tree-patches/$1/}"
     g="${g%.patch}"
-    add_patch "${f}" "drivers/scsi/qla2xxx/${g}"
+    if [ "$g" = "qla.h" ]; then
+	add_patch "${f}" "include/trace/events/${g}"
+    else
+	add_patch "${f}" "drivers/scsi/qla2xxx/${g}"
+    fi
   done
 
   for f in qla2x00t-32gbit/qla2x00-target/*.[ch]; do

From 5a99fa9a8cc1f7839d095b913aa3fbec1a71d85c Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Fri, 8 May 2020 15:32:10 +0000
Subject: [PATCH 2/2] qla2x00t-32gbit: Move the trace/events/qla.h include file

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8877 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t-32gbit/Makefile                         |  5 +++--
 qla2x00t-32gbit/extract-qla2xxx-orig             | 10 +++++-----
 qla2x00t-32gbit/generate-in-tree-patches         |  4 ++--
 qla2x00t-32gbit/{ => include}/trace/events/qla.h |  0
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename qla2x00t-32gbit/{ => include}/trace/events/qla.h (100%)

diff --git a/qla2x00t-32gbit/Makefile b/qla2x00t-32gbit/Makefile
index c2cc64523..8a6e745a6 100644
--- a/qla2x00t-32gbit/Makefile
+++ b/qla2x00t-32gbit/Makefile
@@ -45,8 +45,9 @@ endif
 INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 
 ifneq ($(PATCHLEVEL),)
-ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter \
-	-Wno-missing-field-initializers -I$(src)/../scst/include -I$(src)\
+ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter	\
+	-Wno-missing-field-initializers				\
+	-I$(src)/../scst/include -I$(src)/include		\
 	-DDEFAULT_SYMBOL_NAMESPACE=QLA32GB
 
 ifneq ($(CONFIG_SCSI_QLA2XXX_TARGET),)
diff --git a/qla2x00t-32gbit/extract-qla2xxx-orig b/qla2x00t-32gbit/extract-qla2xxx-orig
index 3e41f29eb..59aba4837 100755
--- a/qla2x00t-32gbit/extract-qla2xxx-orig
+++ b/qla2x00t-32gbit/extract-qla2xxx-orig
@@ -18,12 +18,12 @@ cd qla2xxx-orig || exit $?
 download_and_extract_kernel_tree "${kernel_version}"
 touch "linux-${kernel_version}"/drivers/scsi/qla2xxx/*
 rm -rf "${kernel_version}"
-mkdir -p "${kernel_version}/trace/events"
+mkdir -p "${kernel_version}/include/trace/events"
 mv "linux-${kernel_version}"/drivers/scsi/qla2xxx/* "${kernel_version}"
-if [ -e "linux-${kernel_version}"/trace/events/qla.h ]; then
-    touch "linux-${kernel_version}"/trace/events/qla.h
-    mv "linux-${kernel_version}"/trace/events/qla.h \
-       "${kernel_version}/trace/events"
+if [ -e "linux-${kernel_version}"/include/trace/events/qla.h ]; then
+    touch "linux-${kernel_version}"/include/trace/events/qla.h
+    mv "linux-${kernel_version}"/include/trace/events/qla.h \
+       "${kernel_version}/include/trace/events"
 fi
 rm -rf "linux-${kernel_version}"
 cd ..
diff --git a/qla2x00t-32gbit/generate-in-tree-patches b/qla2x00t-32gbit/generate-in-tree-patches
index 73faf5518..9b8c8d2ce 100755
--- a/qla2x00t-32gbit/generate-in-tree-patches
+++ b/qla2x00t-32gbit/generate-in-tree-patches
@@ -26,10 +26,10 @@ for g in Kconfig *.[ch]; do
   fi
 done
 
-for g in trace/events/qla.h; do
+for g in include/trace/events/qla.h; do
   f1="qla2xxx-orig/${kernel_version}/$g"
   f2="$g"
-  f3="in-tree-patches/${kernel_version}/${g#trace/events/}.patch"
+  f3="in-tree-patches/${kernel_version}/${g#include/trace/events/}.patch"
   if [ "$f1" -nt "$f3" -o "$f2" -nt "$f3" ]; then
     if [ -e "$f1" ]; then
       diff -up "$f1" "$f2" > "$f3"
diff --git a/qla2x00t-32gbit/trace/events/qla.h b/qla2x00t-32gbit/include/trace/events/qla.h
similarity index 100%
rename from qla2x00t-32gbit/trace/events/qla.h
rename to qla2x00t-32gbit/include/trace/events/qla.h