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

16 files changed, 33 insertions, 24 deletions

diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 640b483cf..11347beea 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -69,7 +69,7 @@ CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_WATCHDOG=y
@@ -3941,7 +3941,7 @@ CONFIG_MTD_NAND_MARVELL=m
 # CONFIG_MTD_NAND_MESON is not set
 # CONFIG_MTD_NAND_MXC is not set
 # CONFIG_MTD_NAND_MXIC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_OMAP2 is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_QCOM is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index d855ee119..ab032abca 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -69,7 +69,7 @@ CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_WATCHDOG=y
@@ -3922,7 +3922,7 @@ CONFIG_MTD_NAND_MARVELL=m
 # CONFIG_MTD_NAND_MESON is not set
 # CONFIG_MTD_NAND_MXC is not set
 # CONFIG_MTD_NAND_MXIC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_OMAP2 is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_QCOM is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index eeec78feb..aba044315 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -43,7 +43,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index dd6cbf5f5..5963b9f5d 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -43,7 +43,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index d3190b1c2..e6b5ec8dd 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -43,7 +43,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 8a8d971a8..c0e1dc44c 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -43,7 +43,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index b105356e1..7f07ff722 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -73,7 +73,7 @@ CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_TOSHIBA=m
@@ -3622,7 +3622,7 @@ CONFIG_MTD_NAND_CAFE=m
 # CONFIG_MTD_NAND_MESON is not set
 # CONFIG_MTD_NAND_MXC is not set
 # CONFIG_MTD_NAND_MXIC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_OMAP2 is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_QCOM is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 8601ec2f9..f3841217b 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -73,7 +73,7 @@ CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_TOSHIBA=m
@@ -3603,7 +3603,7 @@ CONFIG_MTD_NAND_CAFE=m
 # CONFIG_MTD_NAND_MESON is not set
 # CONFIG_MTD_NAND_MXC is not set
 # CONFIG_MTD_NAND_MXIC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_OMAP2 is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_QCOM is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 014609ede..179543179 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -42,7 +42,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
@@ -3329,7 +3329,7 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_MESON is not set
 # CONFIG_MTD_NAND_MXC is not set
 # CONFIG_MTD_NAND_MXIC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_OMAP2 is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_QCOM is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index afef5c1dc..c1a5a73e9 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -42,7 +42,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
@@ -3309,7 +3309,7 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_MESON is not set
 # CONFIG_MTD_NAND_MXC is not set
 # CONFIG_MTD_NAND_MXIC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_OMAP2 is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_QCOM is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 045af30c6..c3732ad47 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -43,7 +43,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
@@ -3302,7 +3302,7 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_MESON is not set
 # CONFIG_MTD_NAND_MXC is not set
 # CONFIG_MTD_NAND_MXIC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_OMAP2 is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_QCOM is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index bfe3abbbb..aa172eca7 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -43,7 +43,7 @@ CONFIG_ACPI_HMAT=y
 # CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_AD2S1200 is not set
@@ -3282,7 +3282,7 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_MESON is not set
 # CONFIG_MTD_NAND_MXC is not set
 # CONFIG_MTD_NAND_MXIC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_OMAP2 is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_QCOM is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 1fc6aca23..d40c05c40 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -76,7 +76,7 @@ CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_TOSHIBA=m
@@ -3664,7 +3664,7 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_MESON is not set
 # CONFIG_MTD_NAND_MXC is not set
 # CONFIG_MTD_NAND_MXIC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_OMAP2 is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_QCOM is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index e3d58db09..a3a70bac7 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -76,7 +76,7 @@ CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TAD=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_TOSHIBA=m
@@ -3645,7 +3645,7 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_NAND_MESON is not set
 # CONFIG_MTD_NAND_MXC is not set
 # CONFIG_MTD_NAND_MXIC is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_OMAP2 is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_QCOM is not set
diff --git a/kernel.spec b/kernel.spec
index 14da5d159..803a0b0d2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -3002,6 +3002,10 @@ fi
 #
 #
 %changelog
+* Thu Nov 19 07:09:26 CST 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.9.9-200
+- Linux v5.9.9
+- Enable NANDSIM (rhbz 1898638)
+
 * Thu Nov 12 2020 Justin M. Forbes <jforbes@fedoraproject.org>
 - Fix bluetooth device disconnect issues. (rhbz 1897038)
 
diff --git a/parallel_xz.sh b/parallel_xz.sh
index bc08a548d..0d98eadeb 100755
--- a/parallel_xz.sh
+++ b/parallel_xz.sh
@@ -16,6 +16,11 @@ while test "$#" != 0; do
 	shift
 done
 
+#This seems to cause problems with large numbers
+if (( $procgroup > 6 )); then
+	procgroup=6
+fi
+
 # If told to use only one cpu:
 test "$procgroup" || exec xargs -r xz
 test "$procgroup" = 1 && exec xargs -r xz