diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-08 17:31:35 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-08 17:31:35 +0200 |
commit | 5758abca176f823ef270f2f8c90c17abe2200879 (patch) | |
tree | 924e34319e919b9e01133cbe1821fa8f84fd6862 | |
parent | 9af9a7983bcb0ae2070aad7cac8b30033ab6169d (diff) | |
parent | 2bd6c5e4ca1eaa5e046982bd0f8ba3b4fa505277 (diff) | |
download | kernel-5758abca176f823ef270f2f8c90c17abe2200879.tar.gz kernel-5758abca176f823ef270f2f8c90c17abe2200879.tar.xz kernel-5758abca176f823ef270f2f8c90c17abe2200879.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.19.0-0.rc1.20220608git9886142c7a22.16.vanilla.1.fc36
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-aarch64-fedora.config | 2 | ||||
-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-ppc64le-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le-fedora.config | 2 | ||||
-rw-r--r-- | kernel-s390x-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-s390x-fedora.config | 2 | ||||
-rw-r--r-- | kernel-x86_64-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-x86_64-fedora.config | 2 | ||||
-rwxr-xr-x | kernel.spec | 14 | ||||
-rw-r--r-- | sources | 6 |
15 files changed, 26 insertions, 20 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 5e65c2fc9..6f3deb6db 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 = 14 +RHEL_RELEASE = 16 # # ZSTREAM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 16bf5cfe8..5f773e251 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5740,7 +5740,7 @@ CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y CONFIG_RCU_REF_SCALE_TEST=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d27ede024..3107a04eb 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5719,7 +5719,7 @@ CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y # CONFIG_RCU_REF_SCALE_TEST is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index f6367245f..9976ef8ee 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -5801,7 +5801,7 @@ CONFIG_RC_MAP=m CONFIG_RC_ST=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y CONFIG_RCU_REF_SCALE_TEST=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 2e2599c46..82b2c336a 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -5782,7 +5782,7 @@ CONFIG_RC_MAP=m CONFIG_RC_ST=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y # CONFIG_RCU_REF_SCALE_TEST is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 11439fbb5..4bc59c43a 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -5648,7 +5648,7 @@ CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y CONFIG_RCU_REF_SCALE_TEST=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 833aa527f..38a167dcd 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5629,7 +5629,7 @@ CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y # CONFIG_RCU_REF_SCALE_TEST is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 2dfa0c4ec..6910d2a4d 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4831,7 +4831,7 @@ CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y CONFIG_RCU_REF_SCALE_TEST=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index e670887f7..f038b9506 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4810,7 +4810,7 @@ CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y # CONFIG_RCU_REF_SCALE_TEST is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 4727a268b..953b16b9e 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4772,7 +4772,7 @@ CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y CONFIG_RCU_REF_SCALE_TEST=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 558104f06..70b40ce4e 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4751,7 +4751,7 @@ CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y # CONFIG_RCU_REF_SCALE_TEST is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 7213771b9..466ff22d6 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5172,7 +5172,7 @@ CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y CONFIG_RCU_REF_SCALE_TEST=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index b2fb6bc1c..d6ca76850 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5152,7 +5152,7 @@ CONFIG_RC_LOOPBACK=m CONFIG_RC_MAP=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y # CONFIG_RCU_REF_SCALE_TEST is not set diff --git a/kernel.spec b/kernel.spec index 406a99e7c..bc3fd61d9 100755 --- a/kernel.spec +++ b/kernel.spec @@ -124,17 +124,17 @@ 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 # define buildid .local %define specversion 5.19.0 %define patchversion 5.19 -%define pkgrelease 0.rc1.14 +%define pkgrelease 0.rc1.20220608git9886142c7a22.16 %define kversion 5 -%define tarfile_release 5.19-rc1 +%define tarfile_release 5.19-rc1-11-g9886142c7a22 # This is needed to do merge window version magic %define patchlevel 19 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.14%{?buildid}%{?dist} +%define specrelease 0.rc1.20220608git9886142c7a22.16%{?buildid}%{?dist} # # End of genspec.sh variables @@ -3048,6 +3048,12 @@ fi # # %changelog +* Wed Jun 08 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.19.0-0.rc1.20220608git9886142c7a22.16] +- Drop RCU_EXP_CPU_STALL_TIMEOUT to 0, we are not really android (Justin M. Forbes) + +* Tue Jun 07 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc1.e71e60cd74df.14] +- redhat/configs/README: Update the README (Prarit Bhargava) + * Mon Jun 06 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc1.13] - redhat/docs: fix hyperlink typo (Patrick Talbert) - all: net: remove old NIC/ATM drivers that use virt_to_bus() (Peter Robinson) @@ -1,3 +1,3 @@ -SHA512 (linux-5.19-rc1.tar.xz) = 583830537c742f4f254bca2b6e704dc215f99fe987eeb7510f964b890a2a7311c57a44eee0235a5174c0428c4338e3151fecc904f2cc493b2e8aaa9ff45854ab -SHA512 (kernel-abi-stablelists-5.19.0-0.rc1.14.tar.bz2) = 5d46ead20dcbc99a6dfdb10538f8253de452f7b64defd740ee9f334ac32b15759babe8bcdaef5393cef37ab18b675d070e7274b8adc3562537ab0347093f2b3a -SHA512 (kernel-kabi-dw-5.19.0-0.rc1.14.tar.bz2) = 791144af8e4890ff6bbd101960cf0cffb6fe538a0faa09b7422532c3a27e6fe3a922b9f6a658c118403f820e1d896921dfe9b8e77bb37e984fd84cb06e24935e +SHA512 (linux-5.19-rc1-11-g9886142c7a22.tar.xz) = d39b07b74fc974d25469647cf5e3a75faa0a75dd543e5d4b9eb8e53bf653de819cec5fb64e2045dc27fb733147dd431e2e1cda11a3540da4e5c681862a93e444 +SHA512 (kernel-abi-stablelists-5.19.0-0.rc1.20220608git9886142c7a22.16.tar.bz2) = fdd627b0da4f6f121234a36708e2c9f2fc1226d72973f10589d0be37afbf85903465fb96c108cf2c80357d65cd827d1becc927f5d7ef75074891c7637d1f63d1 +SHA512 (kernel-kabi-dw-5.19.0-0.rc1.20220608git9886142c7a22.16.tar.bz2) = 2898d155f54a07255dbd5aeda7dd220817f1b8084e747a6425a4ab6314d0dca3c57f02e7feb26b589592fc7b450f29c43756e7091bae8b1dafaee0659665e976 |