diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-11-19 09:51:09 -0600 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-11-19 09:51:09 -0600 |
commit | 9a733b7fc936752211d28f5c0fca84ddd7aa7da4 (patch) | |
tree | e81c421e58182d06e427a440d1afaa1198441006 | |
parent | 4d0a2f43d842addc58042f17962753b462576ef3 (diff) | |
download | kernel-9a733b7fc936752211d28f5c0fca84ddd7aa7da4.tar.gz kernel-9a733b7fc936752211d28f5c0fca84ddd7aa7da4.tar.xz kernel-9a733b7fc936752211d28f5c0fca84ddd7aa7da4.zip |
kernel-5.10.0-0.rc4.20201119gitc2e7554e1b85.80
* Thu Nov 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201119gitc2e7554e1b85.80]
- No need to review, Temporary workarounds due to DEBUG_INFO_BTF not working ("Justin M. Forbes")
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-aarch64-fedora.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-fedora.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-fedora.config | 2 | ||||
-rw-r--r-- | kernel-i686-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-i686-fedora.config | 4 | ||||
-rw-r--r-- | kernel-ppc64le-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-ppc64le-fedora.config | 4 | ||||
-rw-r--r-- | kernel-s390x-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-s390x-fedora.config | 4 | ||||
-rw-r--r-- | kernel-x86_64-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-x86_64-fedora.config | 4 | ||||
-rw-r--r-- | kernel.spec | 22 | ||||
-rwxr-xr-x | parallel_xz.sh | 4 | ||||
-rw-r--r-- | sources | 6 |
18 files changed, 45 insertions, 37 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index d82358ca5..7f8fb896e 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 79 +RHEL_RELEASE = 81 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 98f1cadec..ecad32170 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 @@ -4020,7 +4020,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 dc86e0958..51418dc4e 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 @@ -4001,7 +4001,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 abb300354..c8e0eab85 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 907abbff6..b7a7c8e3d 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 c0fb15e24..ea4017dee 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 815daa189..c324542c7 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 d7846be21..5866c89a8 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 @@ -3675,7 +3675,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 4aabb9099..ea7194242 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 @@ -3656,7 +3656,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 432ab1e9b..699907278 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 @@ -3383,7 +3383,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 a41d741bd..ce22a3711 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 @@ -3363,7 +3363,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 e211f35e5..3d421c47f 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 @@ -3356,7 +3356,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 ec25e6307..52f157008 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 @@ -3336,7 +3336,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 ebc4ca81a..f6dc39353 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 @@ -3718,7 +3718,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 49882676c..7990f60f3 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 @@ -3699,7 +3699,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 ee969a92e..f6f76c5d0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc4.20201117git9c87c9f41245.79 +%global distro_build 0.rc4.20201119gitc2e7554e1b85.81 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -95,13 +95,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.10.0 -%define pkgrelease 0.rc4.20201117git9c87c9f41245.79 +%define pkgrelease 0.rc4.20201119gitc2e7554e1b85.81 # This is needed to do merge window version magic %define patchlevel 10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20201117git9c87c9f41245.79%{?buildid}%{?dist} +%define specrelease 0.rc4.20201119gitc2e7554e1b85.81%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -592,7 +592,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20201117git9c87c9f41245.tar.xz +Source0: linux-20201119gitc2e7554e1b85.tar.xz Source1: Makefile.rhelver @@ -1236,8 +1236,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20201117git9c87c9f41245 -c -mv linux-20201117git9c87c9f41245 linux-%{KVERREL} +%setup -q -n kernel-20201119gitc2e7554e1b85 -c +mv linux-20201119gitc2e7554e1b85 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2689,9 +2689,17 @@ fi # # %changelog -* Tue Nov 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201117git9c87c9f41245.78] +* Thu Nov 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201119gitc2e7554e1b85.80] - No need to review, Temporary workarounds due to DEBUG_INFO_BTF not working ("Justin M. Forbes") +* Thu Nov 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201119gitc2e7554e1b85.79.test] +- c2e7554e1b85 rebase +- Enable NANDSIM for Fedora ("Justin M. Forbes") +- Re-enable CONFIG_ACPI_TABLE_UPGRADE for Fedora since upstream disables this if secureboot is active ("Justin M. Forbes") + +* Wed Nov 18 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201118git0fa8ee0d9ab9.78.test] +- 0fa8ee0d9ab9 rebase + * Tue Nov 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201117git9c87c9f41245.77.test] - 9c87c9f41245 rebase diff --git a/parallel_xz.sh b/parallel_xz.sh index 65621501c..e2c961102 100755 --- a/parallel_xz.sh +++ b/parallel_xz.sh @@ -17,8 +17,8 @@ while test "$#" != 0; do done #This seems to cause problems with large numbers -if (( $procgroup > 8 )); then - procgroup=8 +if (( $procgroup > 4 )); then + procgroup=4 fi # If told to use only one cpu: @@ -1,3 +1,3 @@ -SHA512 (linux-20201117git9c87c9f41245.tar.xz) = 239d125bacb0dce3f209858e961dcda65a06ae90487ff7ec3cfcff9c39acf5842ca86d5abd2e618f1ee1a78436d9c1f510003da0d76a100e7519b82df309021c -SHA512 (kernel-abi-whitelists-5.10.0-0.rc4.20201117git9c87c9f41245.79.tar.bz2) = d063c44dea5aec587235a751f6daa4b053a3f536019cdb900c288dfc551af51e0fd6b46925390b0ccaca17ad848cc4885ec357ae94538a2d7505572c37117fa4 -SHA512 (kernel-kabi-dw-5.10.0-0.rc4.20201117git9c87c9f41245.79.tar.bz2) = 8276fe66822069224e8b1a7d1193833756d7d2535a5785581e010af856d915777189f25d051b820f131771e3d96c410a462d1bdcbd4c79e406c8c4e58d46dd31 +SHA512 (linux-20201119gitc2e7554e1b85.tar.xz) = cf600a9e7c6a4112dc3e1dcaa9041079d35413a0f12656ecee4f8c60afce517e5b719fd4c28e4e65619f9454762637daaf6668461dcaef29ce21e926b7404659 +SHA512 (kernel-abi-whitelists-5.10.0-0.rc4.20201119gitc2e7554e1b85.81.tar.bz2) = 3faaae1b3eb384d35633ca901023e6055851ae9f694a628498d4299189c14e827863d35492c47da88638a6c57353b548cfb1393bbbb64272b0c6ca0fb726ff1d +SHA512 (kernel-kabi-dw-5.10.0-0.rc4.20201119gitc2e7554e1b85.81.tar.bz2) = b6eed06afe9de79895298f10ef1de7644b03b1e9cf840aa8db47e51c0a8ed218f787dfa8bad9b5747af5b664e04736d50872c7e67ee22e530ae8b706e15da09b |