summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-01-28 09:41:44 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-01-28 09:41:44 -0600
commit2baea89da1692847bfba25e77741beee9b43f9bf (patch)
tree7c3de28fab59cfdd40d3c16b6c1cc38e438e2674
parent854c564e0729cc458e4878c09b63853ad406718b (diff)
downloadkernel-2baea89da1692847bfba25e77741beee9b43f9bf.tar.gz
kernel-2baea89da1692847bfba25e77741beee9b43f9bf.tar.xz
kernel-2baea89da1692847bfba25e77741beee9b43f9bf.zip
kernel-5.17-0.rc1.20220128git145d9b498fc8.79
* Fri Jan 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc1.20220128git145d9b498fc8.79] - Add test_hash to the mod-internal.list (Justin M. Forbes) - configs: disable CONFIG_CRAMFS (Abhi Das) [2041184] Resolves: rhbz#2041184 Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-fedora.config2
-rw-r--r--kernel-aarch64-debug-rhel.config4
-rw-r--r--kernel-aarch64-fedora.config2
-rw-r--r--kernel-aarch64-rhel.config4
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
-rw-r--r--kernel-i686-debug-fedora.config2
-rw-r--r--kernel-i686-fedora.config2
-rw-r--r--kernel-ppc64le-debug-fedora.config2
-rw-r--r--kernel-ppc64le-debug-rhel.config4
-rw-r--r--kernel-ppc64le-fedora.config2
-rw-r--r--kernel-ppc64le-rhel.config4
-rw-r--r--kernel-s390x-debug-fedora.config2
-rw-r--r--kernel-s390x-debug-rhel.config4
-rw-r--r--kernel-s390x-fedora.config2
-rw-r--r--kernel-s390x-rhel.config4
-rw-r--r--kernel-s390x-zfcpdump-rhel.config2
-rw-r--r--kernel-x86_64-debug-fedora.config2
-rw-r--r--kernel-x86_64-debug-rhel.config4
-rw-r--r--kernel-x86_64-fedora.config2
-rw-r--r--kernel-x86_64-rhel.config4
-rwxr-xr-xkernel.spec16
-rw-r--r--mod-internal.list1
-rw-r--r--patch-5.17-redhat.patch35
-rw-r--r--sources6
28 files changed, 81 insertions, 41 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index dbfa75069..7afb13dc6 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 = 78
+RHEL_RELEASE = 79
#
# Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 193b00827..900f45a65 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1227,7 +1227,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
CONFIG_CPU_THERMAL=y
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 2632e723e..13fa18fc8 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -913,7 +913,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
CONFIG_CPU_THERMAL=y
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
@@ -3621,7 +3621,7 @@ CONFIG_NET_VENDOR_CHELSIO=y
# CONFIG_NET_VENDOR_DEC is not set
# CONFIG_NET_VENDOR_DLINK is not set
# CONFIG_NET_VENDOR_EMULEX is not set
-CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_NET_VENDOR_ENGLEDER is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
CONFIG_NET_VENDOR_GOOGLE=y
CONFIG_NET_VENDOR_HISILICON=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index facd1cdb1..3adc3c257 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1227,7 +1227,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
CONFIG_CPU_THERMAL=y
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 6c9b362c7..2d1bbbacb 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -913,7 +913,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPUMASK_OFFSTACK is not set
CONFIG_CPUSETS=y
CONFIG_CPU_THERMAL=y
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
@@ -3600,7 +3600,7 @@ CONFIG_NET_VENDOR_CHELSIO=y
# CONFIG_NET_VENDOR_DEC is not set
# CONFIG_NET_VENDOR_DLINK is not set
# CONFIG_NET_VENDOR_EMULEX is not set
-CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_NET_VENDOR_ENGLEDER is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
CONFIG_NET_VENDOR_GOOGLE=y
CONFIG_NET_VENDOR_HISILICON=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 713966bad..8cfce28c6 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1228,7 +1228,7 @@ CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
CONFIG_CPU_SW_DOMAIN_PAN=y
CONFIG_CPU_THERMAL=y
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 8a3b9cc94..50429de8c 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1228,7 +1228,7 @@ CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
CONFIG_CPU_SW_DOMAIN_PAN=y
CONFIG_CPU_THERMAL=y
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 3a8a2a1c4..d49d4d367 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -1200,7 +1200,7 @@ CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_SW_DOMAIN_PAN is not set
CONFIG_CPU_THERMAL=y
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 54e50eaa9..c08afb2e3 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1200,7 +1200,7 @@ CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_SW_DOMAIN_PAN is not set
CONFIG_CPU_THERMAL=y
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index ba1650d47..c63f86a0a 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -989,7 +989,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 41071884c..927633871 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -988,7 +988,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 00bfc8983..c17f682a3 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -941,7 +941,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 3d98d4b2f..c585c340e 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -779,7 +779,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
@@ -3445,7 +3445,7 @@ CONFIG_NET_VENDOR_CISCO=y
CONFIG_NET_VENDOR_DEC=y
# CONFIG_NET_VENDOR_DLINK is not set
CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_NET_VENDOR_ENGLEDER is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HUAWEI is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 6b63e8445..32f62d7ae 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -940,7 +940,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 0868fbc7f..2313c74a4 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -779,7 +779,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_CPUMASK_OFFSTACK is not set
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
@@ -3427,7 +3427,7 @@ CONFIG_NET_VENDOR_CISCO=y
CONFIG_NET_VENDOR_DEC=y
# CONFIG_NET_VENDOR_DLINK is not set
CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_NET_VENDOR_ENGLEDER is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HUAWEI is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 1b3c19bf2..df71380c6 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -947,7 +947,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 2eb41a28a..d6489480a 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -778,7 +778,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
@@ -3426,7 +3426,7 @@ CONFIG_NET_VENDOR_ASIX=y
# CONFIG_NET_VENDOR_DEC is not set
# CONFIG_NET_VENDOR_DLINK is not set
# CONFIG_NET_VENDOR_EMULEX is not set
-CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_NET_VENDOR_ENGLEDER is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HUAWEI is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 5b79a218a..4ef590a7a 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -946,7 +946,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index e7b779057..33f273b03 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -778,7 +778,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
@@ -3408,7 +3408,7 @@ CONFIG_NET_VENDOR_ASIX=y
# CONFIG_NET_VENDOR_DEC is not set
# CONFIG_NET_VENDOR_DLINK is not set
# CONFIG_NET_VENDOR_EMULEX is not set
-CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_NET_VENDOR_ENGLEDER is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HUAWEI is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 8817161a3..e183e1c47 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -3423,7 +3423,7 @@ CONFIG_NET_VENDOR_ASIX=y
# CONFIG_NET_VENDOR_DEC is not set
# CONFIG_NET_VENDOR_DLINK is not set
# CONFIG_NET_VENDOR_EMULEX is not set
-CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_NET_VENDOR_ENGLEDER is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HUAWEI is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index efb7e2f38..a9e9d7edc 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1001,7 +1001,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 945d5bfad..c56cd1031 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -809,7 +809,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
@@ -3621,7 +3621,7 @@ CONFIG_NET_VENDOR_CISCO=y
CONFIG_NET_VENDOR_DEC=y
CONFIG_NET_VENDOR_DLINK=y
CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_NET_VENDOR_ENGLEDER is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
CONFIG_NET_VENDOR_GOOGLE=y
CONFIG_NET_VENDOR_HUAWEI=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index bc16ae04e..db4882daa 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1000,7 +1000,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 65207050d..39054aa18 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -809,7 +809,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPUMASK_OFFSTACK=y
CONFIG_CPUSETS=y
# CONFIG_CPU_THERMAL is not set
-CONFIG_CRAMFS=m
+# CONFIG_CRAMFS is not set
# CONFIG_CRAMFS_MTD is not set
CONFIG_CRASH_DUMP=y
CONFIG_CRC16=y
@@ -3601,7 +3601,7 @@ CONFIG_NET_VENDOR_CISCO=y
CONFIG_NET_VENDOR_DEC=y
CONFIG_NET_VENDOR_DLINK=y
CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_NET_VENDOR_ENGLEDER is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
CONFIG_NET_VENDOR_GOOGLE=y
CONFIG_NET_VENDOR_HUAWEI=y
diff --git a/kernel.spec b/kernel.spec
index 7fd042c3b..a1d49823b 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc1.20220127git626b2dda7651.78
+%global distro_build 0.rc1.20220128git145d9b498fc8.79
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc1.20220127git626b2dda7651.78
+%define pkgrelease 0.rc1.20220128git145d9b498fc8.79
# This is needed to do merge window version magic
%define patchlevel 17
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20220127git626b2dda7651.78%{?buildid}%{?dist}
+%define specrelease 0.rc1.20220128git145d9b498fc8.79%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -692,7 +692,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17-rc1-86-g626b2dda7651.tar.xz
+Source0: linux-5.17-rc1-230-g145d9b498fc8.tar.xz
Source1: Makefile.rhelver
@@ -1388,8 +1388,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.17-rc1-86-g626b2dda7651 -c
-mv linux-5.17-rc1-86-g626b2dda7651 linux-%{KVERREL}
+%setup -q -n kernel-5.17-rc1-230-g145d9b498fc8 -c
+mv linux-5.17-rc1-230-g145d9b498fc8 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -3003,6 +3003,10 @@ fi
#
#
%changelog
+* Fri Jan 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc1.20220128git145d9b498fc8.79]
+- Add test_hash to the mod-internal.list (Justin M. Forbes)
+- configs: disable CONFIG_CRAMFS (Abhi Das) [2041184]
+
* Thu Jan 27 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc1.20220127git626b2dda7651.78]
- spec: speed up "cp -r" when it overwrites existing files. (Denys Vlasenko)
- redhat: use centos x509.genkey file if building under centos (Herton R. Krzesinski)
diff --git a/mod-internal.list b/mod-internal.list
index ca68da9ad..d2eea3055 100644
--- a/mod-internal.list
+++ b/mod-internal.list
@@ -44,3 +44,4 @@ torture
refscale
memcpy_kunit
dev_addr_lists_test
+test_hash
diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch
index a3478f0c5..90d82574b 100644
--- a/patch-5.17-redhat.patch
+++ b/patch-5.17-redhat.patch
@@ -3187,3 +3187,38 @@ index c2d2ab9a2861..f5bed94e4558 100644
struct reloc *rel;
int idx;
+From b3d2907a37c53f7379be8742bfbfe47aa2877bfc Mon Sep 17 00:00:00 2001
+From: "Justin M. Forbes" <jforbes@fedoraproject.org>
+Date: Thu, 27 Jan 2022 15:33:37 -0600
+Subject: [PATCH] Fix subcmd-util for gcc 12
+
+Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
+---
+ tools/lib/subcmd/subcmd-util.h | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/tools/lib/subcmd/subcmd-util.h b/tools/lib/subcmd/subcmd-util.h
+index 794a375dad36..7009fc176636 100644
+--- a/tools/lib/subcmd/subcmd-util.h
++++ b/tools/lib/subcmd/subcmd-util.h
+@@ -49,13 +49,12 @@ static NORETURN inline void die(const char *err, ...)
+
+ static inline void *xrealloc(void *ptr, size_t size)
+ {
+- void *ret = realloc(ptr, size);
+- if (!ret && !size)
+- ret = realloc(ptr, 1);
++ void *ret;
++ if (!size)
++ size = 1;
++ ret = realloc(ptr, size);
+ if (!ret) {
+ ret = realloc(ptr, size);
+- if (!ret && !size)
+- ret = realloc(ptr, 1);
+ if (!ret)
+ die("Out of memory, realloc failed");
+ }
+--
+2.34.1
+
diff --git a/sources b/sources
index eeaf7bc92..c3eaf7661 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17-rc1-86-g626b2dda7651.tar.xz) = 6886ed2daffee48d965fdb536921344f15ee668e373c994f508ed13d92b920df0c216a8bcebb8986e15e81f00fb6795db956a455740bcebcac9595fdfdfbb10f
-SHA512 (kernel-abi-stablelists-5.17.0-0.rc1.20220127git626b2dda7651.78.tar.bz2) = 48b92134a5a87e3b34456703ddc4f425956c744f9ab458ebfa454a705afb0c9db15028634875f919e9adcccf564a07d63639c6af5d2e847ab4e12060bf512a06
-SHA512 (kernel-kabi-dw-5.17.0-0.rc1.20220127git626b2dda7651.78.tar.bz2) = 3d6b1a94c79d3ba13a33cb310522e80a5cf27309a457437092e1c5155dfc166b33e09ff1dce1475369b60890db50aec9896f1af9d9b87ff049ea33b5d87f045f
+SHA512 (linux-5.17-rc1-230-g145d9b498fc8.tar.xz) = c01c770e8695808e64e3b0576dc03d09c40e9acd0496cfde81473057f42669fb55db8d0ee7ea4176236220c6d6763c62bf9aa00c7baf674dbecf1c402b87ee52
+SHA512 (kernel-abi-stablelists-5.17.0-0.rc1.20220128git145d9b498fc8.79.tar.bz2) = 3798b129649a93e78355e0d4e21e8ff23637cf4199f5b34ecaf5295d10c690424832e673fd13864d5cd314f4e5f48d39831999aa8c0a0970fe17b1c908447ad7
+SHA512 (kernel-kabi-dw-5.17.0-0.rc1.20220128git145d9b498fc8.79.tar.bz2) = a6e26cfe5a70fe13d6fcb92dde6099e93c3edae1618f25d026342e4d0914ff297be234951f23b3e14ccd211dc91f5f1bbaf39c87901e47f8848b988ae9c0edd0