summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-12-21 18:06:59 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-12-21 18:06:59 +0100
commitaf31ac2a1af062f8ab2521962a6a21f452926915 (patch)
tree724ddd23804a89e8b8a751b7fbf39fc4ab4a5ec3
parenta5460b69e2f2c395573dc9fd78c40be06345d187 (diff)
parent06e5397535fa7bf798fb32f0335034bba89b52f1 (diff)
downloadkernel-af31ac2a1af062f8ab2521962a6a21f452926915.tar.gz
kernel-af31ac2a1af062f8ab2521962a6a21f452926915.tar.xz
kernel-af31ac2a1af062f8ab2521962a6a21f452926915.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc6.20211221git59b3f9448833.42.vanilla.1.fc35
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-rhel.config4
-rw-r--r--kernel-aarch64-rhel.config4
-rw-r--r--kernel-ppc64le-debug-rhel.config4
-rw-r--r--kernel-ppc64le-rhel.config4
-rw-r--r--kernel-s390x-debug-rhel.config4
-rw-r--r--kernel-s390x-rhel.config4
-rw-r--r--kernel-s390x-zfcpdump-rhel.config4
-rw-r--r--kernel-x86_64-debug-rhel.config4
-rw-r--r--kernel-x86_64-rhel.config4
-rwxr-xr-xkernel.spec17
-rw-r--r--sources6
12 files changed, 32 insertions, 29 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index f4ad3f49d..cbc71de3a 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 = 41
+RHEL_RELEASE = 42
#
# Early y+1 numbering
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 63ff384a3..eb3a6b66e 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1094,9 +1094,9 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set
-CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_DWARF5 is not set
-# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 4663b8941..69d6e3c95 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1094,9 +1094,9 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set
-CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_DWARF5 is not set
-# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index f2a3686ee..06c92cdc9 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -953,9 +953,9 @@ CONFIG_DEBUGGER=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set
-CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_DWARF5 is not set
-# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index c876154c5..fde2a52bf 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -953,9 +953,9 @@ CONFIG_DEBUGGER=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set
-CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_DWARF5 is not set
-# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 95d3b9197..868f87e20 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -958,9 +958,9 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set
-CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_DWARF5 is not set
-# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 288c0f79f..dad37d0da 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -958,9 +958,9 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set
-CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_DWARF5 is not set
-# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index c8107c9a9..c4e8aab0d 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -964,9 +964,9 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set
-CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_DWARF5 is not set
-# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index dbf3dc9df..a1cbef516 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1014,9 +1014,9 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set
-CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_DWARF5 is not set
-# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 5180b21c6..e6fb7a0f0 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1014,9 +1014,9 @@ CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set
-CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
# CONFIG_DEBUG_INFO_DWARF5 is not set
-# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO=y
diff --git a/kernel.spec b/kernel.spec
index 50d643e59..2cb8d4f15 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,9 +85,9 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
-%global distro_build 0.rc6.41
+%global distro_build 0.rc6.20211221git59b3f9448833.42
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -134,13 +134,13 @@ Summary: The Linux kernel
%define rpmversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc6.41
+%define pkgrelease 0.rc6.20211221git59b3f9448833.42
# This is needed to do merge window version magic
%define patchlevel 16
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.41%{?buildid}%{?dist}
+%define specrelease 0.rc6.20211221git59b3f9448833.42%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -691,7 +691,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc6.tar.xz
+Source0: linux-5.16-rc6-6-g59b3f9448833.tar.xz
Source1: Makefile.rhelver
@@ -1385,8 +1385,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-rc6 -c
-mv linux-5.16-rc6 linux-%{KVERREL}
+%setup -q -n kernel-5.16-rc6-6-g59b3f9448833 -c
+mv linux-5.16-rc6-6-g59b3f9448833 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2987,6 +2987,9 @@ fi
#
#
%changelog
+* Tue Dec 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc6.20211221git59b3f9448833.42]
+- Update rebase-notes with dracut 5.17 information (Justin M. Forbes)
+
* Mon Dec 20 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc6.41]
- redhat/configs: Enable CONFIG_CRYPTO_BLAKE2B (Neal Gompa) [2031547]
diff --git a/sources b/sources
index 8a3032ac7..a441e12b4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.16-rc6.tar.xz) = f3ede4eb27a8c53d6b67649bf5c3a2dd25b2b449d8554d6e16813d7a338e169c12c2d74f7073e7c1c491fe27de6445edf9275e84688dd23dc2c583f4eb502c00
-SHA512 (kernel-abi-stablelists-5.16.0-0.rc6.41.tar.bz2) = fbc21ae38f80d2608c24a83e5b3f683f2c858b98bd824fb423f4d461329a8e77792fafec663cee778d9813122aa85f7041edb538ba6064b7c9122c3b58b8d76e
-SHA512 (kernel-kabi-dw-5.16.0-0.rc6.41.tar.bz2) = e99570e3ae1a2591dd30d92d41c459f554ba370645bd87e9d7bc320c493ca30cddc4bc8d014536336cccc998f6f094fc1ac16f1b532a8ff2ae43648dd195fd65
+SHA512 (linux-5.16-rc6-6-g59b3f9448833.tar.xz) = 10ef46413f13d4e5a90c23a8dff787d8a6ed9ec261758516a7dbc281669f074f32f47e6d29299de455e78f472f4ba2443f1b1d54ec61eb1a42b0071be9e5b417
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc6.20211221git59b3f9448833.42.tar.bz2) = 68be8240050882acc3cb48f34cb399888b0f9c5fbe7f80b1eff504659f96e65443ee4f5bb8a07969c1141bff31f21766aea2a879cdb047d49a48ffaee786d9b8
+SHA512 (kernel-kabi-dw-5.16.0-0.rc6.20211221git59b3f9448833.42.tar.bz2) = ae992838dc2b14f37a6c76adf0cf4ccee838e6f43ab4a67b92d734e026151783dce9e44823e8da6e539b8e980ebd1e7dee74cb753172f1d4432de29deafe7c5b