Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora

18 files changed, 146 insertions, 40 deletions

diff --git a/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch b/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch
new file mode 100644
index 000000000..b55daaaeb
--- /dev/null
+++ b/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch
@@ -0,0 +1,36 @@
+From 5a39c1ffc4e18603f2c9af3c0a556e2db6e70705 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Sat, 2 Nov 2019 16:52:15 +0000
+Subject: [PATCH 1/2] usb: host: xhci-tegra: set MODULE_FIRMWARE for tegra186
+
+Set the MODULE_FIRMWARE for tegra186, it's registered for 124/210 and
+ensures the firmware is available at the appropriate time such as in
+the initrd, else if the firmware is unavailable the driver fails with
+the following errors:
+
+tegra-xusb 3530000.usb: Direct firmware load for nvidia/tegra186/xusb.bin failed with error -2
+tegra-xusb 3530000.usb: failed to request firmware: -2
+tegra-xusb 3530000.usb: failed to load firmware: -2
+tegra-xusb: probe of 3530000.usb failed with error -2
+
+Fixes: 5f9be5f3f899 ("usb: host: xhci-tegra: Add Tegra186 XUSB support")
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ drivers/usb/host/xhci-tegra.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
+index 2ff7c911fbd0..d25aba8fa219 100644
+--- a/drivers/usb/host/xhci-tegra.c
++++ b/drivers/usb/host/xhci-tegra.c
+@@ -1433,6 +1433,7 @@ static const struct tegra_xusb_soc tegra186_soc = {
+ 	.scale_ss_clock = false,
+ 	.has_ipfs = false,
+ };
++MODULE_FIRMWARE("nvidia/tegra186/xusb.bin");
+ 
+ static const struct of_device_id tegra_xusb_of_match[] = {
+ 	{ .compatible = "nvidia,tegra124-xusb", .data = &tegra124_soc },
+-- 
+2.23.0
+
diff --git a/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF b/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
index 3b5ac748f..39227b451 100644
--- a/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
+++ b/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
@@ -1 +1 @@
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_GPIO_TPS6586X b/configs/fedora/generic/arm/CONFIG_GPIO_TPS6586X
index c8f2da811..c8f2da811 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_GPIO_TPS6586X
+++ b/configs/fedora/generic/arm/CONFIG_GPIO_TPS6586X
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 25917ed7c..e4d9ee1e3 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1289,7 +1289,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@@ -2063,6 +2063,7 @@ CONFIG_GPIO_TEGRA=y
 CONFIG_GPIO_THUNDERX=m
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS65086=m
+CONFIG_GPIO_TPS6586X=y
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
 CONFIG_GPIO_VIPERBOARD=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index aaa967b28..976e44f89 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1289,7 +1289,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@@ -2047,6 +2047,7 @@ CONFIG_GPIO_TEGRA=y
 CONFIG_GPIO_THUNDERX=m
 # CONFIG_GPIO_TPIC2810 is not set
 CONFIG_GPIO_TPS65086=m
+CONFIG_GPIO_TPS6586X=y
 CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
 CONFIG_GPIO_VIPERBOARD=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index d7d7a9f0a..d54ce8ceb 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1279,7 +1279,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index adda1dc48..7f3b6f529 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1239,7 +1239,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@@ -2011,6 +2011,7 @@ CONFIG_GPIO_SYSCON=m
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
+CONFIG_GPIO_TPS6586X=y
 CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TPS65912=m
 CONFIG_GPIO_TPS68470=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index b37885256..64f70ed8a 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1239,7 +1239,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@@ -1996,6 +1996,7 @@ CONFIG_GPIO_SYSCON=m
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
+CONFIG_GPIO_TPS6586X=y
 CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TPS65912=m
 CONFIG_GPIO_TPS68470=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 6e8ea6ec9..e840ac68c 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1279,7 +1279,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 7ef076f36..bd6a05f50 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1047,7 +1047,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 597f8233c..a2e8941d4 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1046,7 +1046,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index f3db93aef..bab3a555a 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -975,7 +975,7 @@ CONFIG_DEBUGGER=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 0b4218515..b2f334f4f 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -974,7 +974,7 @@ CONFIG_DEBUGGER=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index c5e323fc7..3e6a04264 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -985,7 +985,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index e61d0d588..6915b19b1 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -984,7 +984,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index c1cc5697b..86a8d050e 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1082,7 +1082,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 25e8456ad..6140186ea 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1081,7 +1081,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
diff --git a/kernel.spec b/kernel.spec
index 5534a8aa8..e01d34729 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -75,7 +75,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 3
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -138,6 +138,8 @@ Summary: The Linux kernel
 %define with_debuginfo %{?_with_debuginfo:    1} %{?!_with_debuginfo:    0}
 # Want to build a the vsdo directories installed
 %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
+# kernel-zfcpdump (s390 specific kernel for zfcpdump)
+%define with_zfcpdump  %{?_without_zfcpdump:  0} %{?!_without_zfcpdump:  1}
 # kernel-abi-whitelists
 %define with_kernel_abi_whitelists %{?_without_kernel_abi_whitelists: 0} %{?!_without_kernel_abi_whitelists: 1}
 # internal samples and selftests
@@ -190,7 +192,6 @@ Summary: The Linux kernel
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
 
-
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
@@ -340,6 +341,7 @@ Summary: The Linux kernel
 %define use_vdso 1
 %endif
 
+
 %ifnarch noarch
 %define with_kernel_abi_whitelists 0
 %endif
@@ -374,6 +376,16 @@ Summary: The Linux kernel
 %define with_sparse 0
 %endif
 
+# zfcpdump mechanism is s390 only
+%ifnarch s390x
+%define with_zfcpdump 0
+%endif
+
+%if 0%{?fedora}
+# This is not for Fedora
+%define with_zfcpdump 0
+%endif
+
 # Per-arch tweaks
 
 %ifarch i686
@@ -480,7 +492,6 @@ Summary: The Linux kernel
 %define _use_vdso 0
 %endif
 
-
 #
 # Packages that need to be installed before the kernel is, because the %%post
 # scripts use them.
@@ -514,7 +525,7 @@ Requires: kernel-modules-uname-r = %{KVERREL}%{?variant}
 BuildRequires: kmod, patch, bash, tar, git-core
 BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
 BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex
-BuildRequires: net-tools, hostname, bc, elfutils-devel
+BuildRequires: net-tools, hostname, bc, elfutils-devel, dwarves
 %if 0%{?fedora}
 # Used to mangle unversioned shebangs to be Python 3
 BuildRequires: /usr/bin/pathfix.py
@@ -543,6 +554,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 %if %{with_debuginfo}
 BuildRequires: rpm-build, elfutils
 BuildConflicts: rpm < 4.13.0.1-19
+BuildConflicts: dwarves < 1.13
 # Most of these should be enabled after more investigation
 %undefine _include_minidebuginfo
 %undefine _find_debuginfo_dwz_opts
@@ -562,9 +574,12 @@ BuildRequires: kabi-dw
 %if %{signkernel}%{signmodules}
 BuildRequires: openssl openssl-devel
 %if %{signkernel}
+%ifarch x86_64 aarch64
+BuildRequires: nss-tools
 BuildRequires: pesign >= 0.10-4
 %endif
 %endif
+%endif
 
 %if %{with_cross}
 BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu
@@ -695,6 +710,8 @@ Patch322: mfd-max77620-Do-not-allocate-IRQs-upfront.patch
 Patch323: gpio-max77620-Use-correct-unit-for-debounce-times.patch
 # https://www.spinics.net/lists/linux-tegra/msg44216.html
 Patch324: arm64-tegra186-enable-USB-on-Jetson-TX2.patch
+# https://patchwork.kernel.org/patch/11224177/
+Patch325: arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch
 
 # https://www.spinics.net/lists/arm-kernel/msg761152.html
 Patch342: efi-libstub-arm-account-for-firmware-reserved-memory-at-the-base-of-RAM.patch
@@ -756,6 +773,7 @@ AutoReq: no\
 AutoProv: yes\
 %{nil}
 
+
 %package doc
 Summary: Various documentation bits found in the kernel source
 Group: Documentation
@@ -767,6 +785,7 @@ device drivers shipped with it are documented in these files.
 You'll want to install this package if you need a reference to the
 options that can be passed to Linux kernel modules at load time.
 
+
 %package headers
 Summary: Header files for the Linux kernel for use by glibc
 Obsoletes: glibc-kernheaders < 3.0-46
@@ -842,7 +861,6 @@ The kabidw-base package contains data describing the current ABI of the Red Hat
 Enterprise Linux kernel, suitable for the kabi-dw tool.
 %endif
 
-
 #
 # This macro creates a kernel-<subpackage>-debuginfo package.
 #	%%kernel_debuginfo_package <subpackage>
@@ -1000,6 +1018,14 @@ This package includes a version of the Linux kernel with support for
 Cortex-A15 devices with LPAE and HW virtualisation support
 %endif
 
+%if %{with_zfcpdump}
+%define variant_summary The Linux kernel compiled for zfcpdump usage
+%kernel_variant_package zfcpdump
+%description zfcpdump-core
+The kernel package contains the Linux kernel (vmlinuz) for use by the
+zfcpdump infrastructure.
+%endif # with_zfcpdump
+
 %define variant_summary The Linux kernel compiled with extra debugging enabled
 %kernel_variant_package debug
 %description debug-core
@@ -1050,6 +1076,42 @@ if [ "%{patches}" != "%%{patches}" ] ; then
   done
 fi 2>/dev/null
 
+patch_command='patch -p1 -F1 -s'
+ApplyPatch()
+{
+  local patch=$1
+  shift
+  if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
+    exit 1
+  fi
+  if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then
+    if [ "${patch:0:8}" != "patch-5." ] ; then
+      echo "ERROR: Patch  $patch  not listed as a source patch in specfile"
+      exit 1
+    fi
+  fi 2>/dev/null
+  case "$patch" in
+  *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
+  *.gz)  gunzip  < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
+  *.xz)  unxz    < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
+  *) $patch_command ${1+"$@"} < "$RPM_SOURCE_DIR/$patch" ;;
+  esac
+}
+
+# don't apply patch if it's empty
+ApplyOptionalPatch()
+{
+  local patch=$1
+  shift
+  if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
+    exit 1
+  fi
+  local C=$(wc -l $RPM_SOURCE_DIR/$patch | awk '{print $1}')
+  if [ "$C" -gt 9 ]; then
+    ApplyPatch $patch ${1+"$@"}
+  fi
+}
+
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
 # which speeds things up quite a bit.
@@ -1239,8 +1301,6 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \
 	scripts/show_delta \
 	scripts/diffconfig \
 	scripts/bloat-o-meter \
-	scripts/tracing/draw_functrace.py \
-	scripts/spdxcheck.py \
 	tools/perf/tests/attr.py \
 	tools/perf/scripts/python/stat-cpi.py \
 	tools/perf/scripts/python/sched-migration.py \
@@ -1313,7 +1373,7 @@ OPTS=""
 %endif
 
 cd ..
-# End of Configs stuff
+# # End of Configs stuff
 
 # get rid of unwanted files resulting from patch fuzz
 find . \( -name "*.orig" -o -name "*~" \) -delete >/dev/null
@@ -1369,6 +1429,9 @@ BuildKernel() {
     InstallName=${5:-vmlinuz}
 
     DoModules=1
+    if [ "$Flavour" = "zfcpdump" ]; then
+	    DoModules=0
+    fi
 
     # Pick the right config file for the kernel we're building
     Config=kernel-%{version}-%{_target_cpu}${Flavour:+-${Flavour}}.config
@@ -1453,7 +1516,6 @@ BuildKernel() {
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/lib/modules/$KernelVer/zImage.stub-$KernelVer || :
     fi
 
-
     %if %{signkernel}
     if [ "$KernelImage" = vmlinux ]; then
         # We can't strip and sign $KernelImage in place, because
@@ -1511,7 +1573,6 @@ BuildKernel() {
     sha512hmac $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer | sed -e "s,$RPM_BUILD_ROOT,," > $RPM_BUILD_ROOT/%{image_install_path}/.vmlinuz-$KernelVer.hmac;
     cp $RPM_BUILD_ROOT/%{image_install_path}/.vmlinuz-$KernelVer.hmac $RPM_BUILD_ROOT/lib/modules/$KernelVer/.vmlinuz.hmac
 
-
     if [ $DoModules -eq 1 ]; then
 	# Override $(mod-fw) because we don't want it to install any firmware
 	# we'll get it from the linux-firmware package and we don't want conflicts
@@ -1535,6 +1596,7 @@ BuildKernel() {
                 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernel-$KernelVer.conf
 	     echo /etc/ld.so.conf.d/kernel-$KernelVer.conf >> ../kernel${Flavour:+-${Flavour}}-ldsoconf.list
         fi
+
         rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/vdso/.build-id
     fi
 
@@ -1647,18 +1709,10 @@ BuildKernel() {
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+    rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/tracing
+    rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/spdxcheck.py
     if [ -f tools/objtool/objtool ]; then
       cp -a tools/objtool/objtool $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/ || :
-      # these are a few files associated with objtool
-      cp -a --parents tools/build/Build.include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
-      cp -a --parents tools/build/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
-      cp -a --parents tools/build/fixdep.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
-      cp -a --parents tools/scripts/utilities.mak $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
-      # also more than necessary but it's not that many more files
-      cp -a --parents tools/objtool/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
-      cp -a --parents tools/lib/str_error_r.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
-      cp -a --parents tools/lib/string.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
-      cp -a --parents tools/lib/subcmd/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     fi
     if [ -d arch/$Arch/scripts ]; then
       cp -a arch/$Arch/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
@@ -1694,7 +1748,7 @@ BuildKernel() {
 
 %endif
     cp -a include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-%ifarch %{ix86} x86_64
+%ifarch i686 x86_64
     # files for 'make prepare' to succeed with kernel-devel
     cp -a --parents arch/x86/entry/syscalls/syscall_32.tbl $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     cp -a --parents arch/x86/entry/syscalls/syscalltbl.sh $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
@@ -1705,9 +1759,7 @@ BuildKernel() {
     cp -a --parents arch/x86/tools/relocs.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     cp -a --parents arch/x86/tools/relocs_common.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     cp -a --parents arch/x86/tools/relocs.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
-    # Yes this is more includes than we probably need. Feel free to sort out
-    # dependencies if you so choose.
-    cp -a --parents tools/include/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+    cp -a --parents tools/include/tools/le_byteshift.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     cp -a --parents arch/x86/purgatory/purgatory.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     cp -a --parents arch/x86/purgatory/stack.S $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     cp -a --parents arch/x86/purgatory/setup-x86_64.S $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
@@ -1918,6 +1970,10 @@ cd linux-%{KVERREL}
 BuildKernel %make_target %kernel_image %{_use_vdso} debug
 %endif
 
+%if %{with_zfcpdump}
+BuildKernel %make_target %kernel_image %{_use_vdso} zfcpdump
+%endif
+
 %if %{with_pae}
 BuildKernel %make_target %kernel_image %{use_vdso} lpae
 %endif
@@ -1954,6 +2010,8 @@ find Documentation -type d | xargs chmod u+w
 #
 # We have to do all of those things _after_ find-debuginfo runs, otherwise
 # that will strip the signature off of the modules.
+#
+# Don't sign modules for the zfcpdump flavour as it is monolithic.
 
 %define __modsign_install_post \
   if [ "%{signmodules}" -eq "1" ]; then \
@@ -2174,7 +2232,6 @@ fi\
 /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
 %{nil}
 
-
 #
 # This macro defines a %%post script for a kernel*-modules package.
 # It also defines a %%postun script that does the same thing.
@@ -2236,6 +2293,11 @@ fi}\
 %kernel_variant_preun debug
 %kernel_variant_post -v debug
 
+%if %{with_zfcpdump}
+%kernel_variant_preun zfcpdump
+%kernel_variant_post -v zfcpdump
+%endif
+
 if [ -x /sbin/ldconfig ]
 then
     /sbin/ldconfig -X || exit $?
@@ -2358,6 +2420,7 @@ fi
 %kernel_variant_files %{_use_vdso} %{with_up}
 %kernel_variant_files %{_use_vdso} %{with_debug} debug
 %kernel_variant_files %{use_vdso} %{with_pae} lpae
+%kernel_variant_files %{_use_vdso} %{with_zfcpdump} zfcpdump
 
 %define kernel_variant_ipaclones(k:) \
 %if %{1}\
@@ -2377,6 +2440,9 @@ fi
 #
 #
 %changelog
+* Fri Nov 01 2019 Laura Abbott <labbott@redhat.com> - 5.4.0-0.rc5.git1.3
+- bump and build again
+
 * Thu Oct 31 2019 Laura Abbott <labbott@redhat.com> - 5.4.0-0.rc5.git1.2
 - bump and build to fix broken weak-updates