forgot some extra bits

9 files changed, 94 insertions, 48 deletions

diff --git a/PatchList.txt b/PatchList.txt
index 0b358213a..c7945639d 100644
--- a/PatchList.txt
+++ b/PatchList.txt
@@ -1,52 +1,76 @@
-**** Backports and patches headed/already upsteram *****************************
+# This file contains patches that we intend to carry for longer than
+# "Should show up in a stable release soonish"
+# Some of these may eventually drop out
 
-* cpupower-Fix-segfault-due-to-incorrect-getopt_long-a.patch (rhbz 1000439)
-  - Queued for next upstream release I believe.  Fixes a segfault in cpupower
+kbuild-AFTER_LINK.patch
 
-* dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch (rhbz 993744)
-  - Still pending upstream
+arm64-avoid-needing-console-to-enable-serial-console.patch
 
-* ath9k_rx_dma_stop_check.patch (rhbz 892811)
-  - Fixes some DMA issue on specific hardware.  Taken from
-https://dev.openwrt.org/browser/trunk/package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch?rev=34910
+geekbox-v4-device-tree-support.patch
 
-* secure-modules.patch
-* modsign-uefi.patch
-* sb-hibernate.patch
-* sysrq-secure-boot.patch
-  - Fedora secure boot support.
-  - Dear Matthew, this is your fault.  Run sed already and get a new set out.
+Initial-AllWinner-A64-and-PINE64-support.patch
 
-**** Other stuff that should go upstream (in decreasing likelyhood) ************
+arm64-pcie-quirks-xgene.patch
 
-* defaults-acpi-video.patch
-* disable-i8042-check-on-apple-mac.patch
-* no-pcspkr-modalias.patch
-* die-floppy-die.patch
-	Fedora policy decisions
-	Turn into CONFIG_ options and upstream ?
+usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch
 
-* input-kill-stupid-messages.patch
-* silence-fbcon-logo.patch
-* silence-noise.patch
-	Fedora local 'hush' patches.  (TODO: push more upstream)
+ARM-tegra-usb-no-reset.patch
 
-* makefile-after_link.patch
-  Rolandware that is used by the debuginfo generation.
-  Possibly upstreamable ?
+bcm283x-upstream-fixes.patch
 
-* serial-460800.patch
-	Probably not upstreamable.
-	http://marc.theaimsgroup.com/?l=linux-kernel&m=112687270832687&w=2
-	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
-	http://lkml.org/lkml/2006/8/2/208
+lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
 
-********************************************************************************
+input-kill-stupid-messages.patch
 
-'MUSTARD' patches.  Fedora local patches that are very unlikely to go upstream.
+die-floppy-die.patch
 
-* crash-driver.patch
-	Unlikely to go upstream.
-	https://bugzilla.redhat.com/show_bug.cgi?id=492803
+no-pcspkr-modalias.patch
+
+silence-fbcon-logo.patch
+
+Kbuild-Add-an-option-to-enable-GCC-VTA.patch
+
+crash-driver.patch
+
+#Secure boot patches
+Add-secure_modules-call.patch
+PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
+x86-Lock-down-IO-port-access-when-module-security-is.patch
+ACPI-Limit-access-to-custom_method.patch
+asus-wmi-Restrict-debugfs-interface-when-module-load.patch
+Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
+acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
+kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
+x86-Restrict-MSR-access-when-module-loading-is-restr.patch
+Add-option-to-automatically-enforce-module-signature.patch
+efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
+efi-Add-EFI_SECURE_BOOT-bit.patch
+hibernate-Disable-in-a-signed-modules-environment.patch
+Add-EFI-signature-data-types.patch
+Add-an-EFI-signature-blob-parser-and-key-loader.patch
+KEYS-Add-a-system-blacklist-keyring.patch
+MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+MODSIGN-Support-not-importing-certs-from-db.patch
+Add-sysrq-option-to-disable-secure-boot-mode.patch
+kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
+
+drm-i915-hush-check-crtc-state.patch
+
+disable-i8042-check-on-apple-mac.patch
+
+lis3-improve-handling-of-null-rate.patch
+
+scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
+
+criu-no-expert.patch
+
+ath9k-rx-dma-stop-check.patch
+
+xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
+
+Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
+
+firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
+
+drm-i915-turn-off-wc-mmaps.patch
 
-********************************************************************************
diff --git a/filter-aarch64.sh b/filter-aarch64.sh
index 70d6338b0..e94f282a2 100644
--- a/filter-aarch64.sh
+++ b/filter-aarch64.sh
@@ -13,4 +13,6 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds medi
 
 ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr vc4"
+drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel radeon rockchip tegra tinydrm vc4"
+
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
diff --git a/filter-armv7hl.sh b/filter-armv7hl.sh
index 2141dfef4..db80ef62f 100644
--- a/filter-armv7hl.sh
+++ b/filter-armv7hl.sh
@@ -13,6 +13,6 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn media mem
 
 ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco dec dlink emulex icplus mellanox micrel myricom natsemi neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis sun tehuti via wiznet xircom"
 
-drmdrvs="amd armada bridge ast exynos i2c imx mgag200 msm omapdrm panel nouveau radeon rockchip tegra tilcdc via"
+drmdrvs="amd armada bridge ast exynos etnaviv hisilicon i2c imx meson mgag200 msm omapdrm panel nouveau radeon rockchip sti tegra tilcdc tinydrm via vc4"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr vc4"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
diff --git a/filter-i686.sh b/filter-i686.sh
index d4770e669..46db4d88c 100644
--- a/filter-i686.sh
+++ b/filter-i686.sh
@@ -11,4 +11,4 @@
 
 driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick mfd mmc mtd mwave nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub hid-sensor-magn-3d hid-sensor-incl-3d hid-sensor-gyro-3d hid-sensor-iio-common hid-sensor-accel-3d hid-sensor-trigger hid-sensor-als hid-sensor-rotation target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr parport_serial"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub hid-sensor-magn-3d hid-sensor-incl-3d hid-sensor-gyro-3d hid-sensor-iio-common hid-sensor-accel-3d hid-sensor-trigger hid-sensor-als hid-sensor-rotation hid-sensor-temperature hid-sensor-humidity target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr parport_serial"
diff --git a/filter-modules.sh b/filter-modules.sh
index c3fbaad03..fb84c6839 100755
--- a/filter-modules.sh
+++ b/filter-modules.sh
@@ -28,7 +28,7 @@ scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2
 
 usbdrvs="atm image misc serial wusbcore"
 
-fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs udf ufs"
+fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs"
 
 netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp wireless"
 
diff --git a/scripts/generate-perf-man.sh b/scripts/generate-perf-man.sh
index 27691fafd..f5332ad86 100755
--- a/scripts/generate-perf-man.sh
+++ b/scripts/generate-perf-man.sh
@@ -47,8 +47,12 @@ if [ ! -z "$@" ]; then
 	esac
     done
 fi
-cd tools/perf/Documentation/
+cd tools/kvm/kvm_stat/
+make man
+mv kvm_stat.1 ../../perf/Documentation
+cd ../../perf/Documentation/
 make
 tar -czvf $BASEDIR/perf-man-${KERNEL_VERSION}.${KERNEL_PATCHLEVEL}.tar.gz *.1
 make clean
+rm kvm_stat.1
 popd
diff --git a/scripts/kernel-version.sh b/scripts/kernel-version.sh
index 36e00194b..e2ec93a5a 100644
--- a/scripts/kernel-version.sh
+++ b/scripts/kernel-version.sh
@@ -1,8 +1,8 @@
-VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/-git.*// | sed s/.xz//)
+VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/-git.*// | sed s/.xz// | tr -d "()")
 
 if [ -z "$VER" ] ;
 then
-    VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.xz//)
+    VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.xz// | tr -d "()")
 fi
 
 
diff --git a/scripts/rawhide-rc.sh b/scripts/rawhide-rc.sh
index 51a3b09f2..40f32a8fe 100755
--- a/scripts/rawhide-rc.sh
+++ b/scripts/rawhide-rc.sh
@@ -3,6 +3,13 @@
 
 source scripts/kernel-version.sh
 
+klist -s
+if [ ! $? -eq 0 ]; then
+	echo "klist couldn't read the credential cache."
+	echo "Do you need to fix your kerberos tokens?"
+	exit 1
+fi
+
 make release
 # fixup the release because rpmdev-bumpspec *sigh*
 scripts/fixup-bumpspec.sh
@@ -12,6 +19,7 @@ fedpkg commit -c
 RC=`grep "%global rcrev" kernel.spec| cut -d ' ' -f 3`
 RC=$(($RC+1))
 BASE=`grep "%define base_sublevel" kernel.spec| cut -d ' ' -f 3`
+OLDBASE=$BASE
 # See comment in kernel.spec about the base numbering
 BASE=$(($BASE+1))
 
@@ -21,10 +29,11 @@ mv sources.tmp sources
 
 # Grab the tarball
 if [ ! -f patch-4.$BASE-rc$RC.xz ]; then
-	wget https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/patch-4.$BASE-rc$RC.xz
+	wget -O patch-4.$BASE-rc$RC https://git.kernel.org/torvalds/p/v4.$BASE-rc$RC/v4.$OLDBASE
 	if [ ! $? -eq 0 ]; then
 		exit 1
 	fi
+	xz -9 patch-4.$BASE-rc$RC
 	fedpkg upload patch-4.$BASE-rc$RC.xz
 fi
 
diff --git a/scripts/rawhide-snapshot.sh b/scripts/rawhide-snapshot.sh
index b96bd38d9..210216b98 100755
--- a/scripts/rawhide-snapshot.sh
+++ b/scripts/rawhide-snapshot.sh
@@ -11,6 +11,13 @@
 
 source scripts/kernel-version.sh
 
+klist -s
+if [ ! $? -eq 0 ]; then
+	echo "klist couldn't read the credential cache."
+	echo "Do you need to fix your kerberos tokens?"
+	exit 1
+fi
+
 git fetch origin
 if [ "$(git rev-parse origin/master)" != "$(git rev-parse HEAD)" ]; then
 	echo "I just did a git fetch and this branch does not match master"