From d093b9fca27f70468537ca14c0c7543cfad35312 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 14 Feb 2022 06:32:32 -0600 Subject: [PATCH] kernel-5.17-0.rc4.96 * Mon Feb 14 2022 Fedora Kernel Team [5.17-0.rc4.96] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) - Workaround for gcc12 compile issues in ubcmd-util.h (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 8 ++++---- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel.spec | 22 ++++++++++++++-------- patch-5.17-redhat.patch | 10 +++++----- sources | 6 +++--- 19 files changed, 41 insertions(+), 35 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index ee27c666c..03d9cace9 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 = 93 +RHEL_RELEASE = 96 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 8b3d6b13b..aa343a35f 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/ada21bfdf0080a6e722fa7728977bbe99d72e2cf - ada21bfdf0080a6e722fa7728977bbe99d72e2cf mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning +https://gitlab.com/cki-project/kernel-ark/-/commit/741f03d77ad0fe53cea44d1ea62fbc9bf48c4535 + 741f03d77ad0fe53cea44d1ea62fbc9bf48c4535 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning -https://gitlab.com/cki-project/kernel-ark/-/commit/96157c95f4773cd7788f4173ca497a2309ff86d7 - 96157c95f4773cd7788f4173ca497a2309ff86d7 Workaround for gcc12 compile issues in ubcmd-util.h +https://gitlab.com/cki-project/kernel-ark/-/commit/6be3e36905dbb2e7a8a23d04af180e5e9e0fd8b2 + 6be3e36905dbb2e7a8a23d04af180e5e9e0fd8b2 Workaround for gcc12 compile issues in ubcmd-util.h https://gitlab.com/cki-project/kernel-ark/-/commit/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b 4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index ee9a58567..f0b612a22 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -8348,7 +8348,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 2aa239255..3f3e9cb65 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -8321,7 +8321,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 332f372d3..3a1f25b6d 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -8586,7 +8586,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index cb0daad85..f587435fe 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -8560,7 +8560,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 24f44c715..c8b2ef8a6 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -8336,7 +8336,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 4346a1a57..ed340790f 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -8310,7 +8310,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 1a04eb78c..d8debc5a7 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -7486,7 +7486,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index b9517ed8b..93278c0c5 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -7460,7 +7460,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index a01f7e6c6..a0bdc44a1 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -7155,7 +7155,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 9359fff0c..ca4d7bbc1 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -7128,7 +7128,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 4e18cddbc..49ebc118b 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -7110,7 +7110,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 2be2a7809..cdc3c078a 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -7083,7 +7083,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 3b1fab000..da6093585 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -7539,7 +7539,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 1504f61ca..1988daf83 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -7513,7 +7513,7 @@ CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m -# CONFIG_VIDEO_OV5693 is not set +CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m diff --git a/kernel.spec b/kernel.spec index c6fc618c1..e35db47b6 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 0 +%define debugbuildsenabled 1 -%global distro_build 0.rc3.20220211gitf1baf68e1383.93 +%global distro_build 0.rc4.96 %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.rc3.20220211gitf1baf68e1383.93 +%define pkgrelease 0.rc4.96 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20220211gitf1baf68e1383.93%{?buildid}%{?dist} +%define specrelease 0.rc4.96%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -695,7 +695,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-rc3-116-gf1baf68e1383.tar.xz +Source0: linux-5.17-rc4.tar.xz Source1: Makefile.rhelver @@ -1391,8 +1391,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc3-116-gf1baf68e1383 -c -mv linux-5.17-rc3-116-gf1baf68e1383 linux-%{KVERREL} +%setup -q -n kernel-5.17-rc4 -c +mv linux-5.17-rc4 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3005,10 +3005,16 @@ fi # # %changelog -* Fri Feb 11 2022 Fedora Kernel Team [5.17-0.rc3.f1baf68e1383.93] +* Mon Feb 14 2022 Fedora Kernel Team [5.17-0.rc4.96] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) - Workaround for gcc12 compile issues in ubcmd-util.h (Justin M. Forbes) +* Sun Feb 13 2022 Fedora Kernel Team [5.17-0.rc3.b81b1829e7e3.94] +- redhat: fix make {distg-brew,distg-koji} (Andrea Claudi) + +* Sat Feb 12 2022 Fedora Kernel Team [5.17-0.rc3.83e396641110.93] +- [fedora] Turn on CONFIG_VIDEO_OV5693 for sensor support (Dave Olsthoorn) + * Fri Feb 11 2022 Fedora Kernel Team [5.17-0.rc3.f1baf68e1383.92] - Cleanup 'disabled' config options for RHEL (Prarit Bhargava) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 1c91ae821..c7be88cf8 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -131,7 +131,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index ceb987e5c87b..b4e3cf779718 100644 +index 51e142f760f7..3abb272fb795 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -177,10 +177,10 @@ index 4c97cb40eebb..caf06cef3d2e 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index cbcd42decb2a..a2920cce2695 100644 +index 09b885cc4db5..73fd512bd66f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1108,7 +1108,7 @@ endchoice +@@ -1109,7 +1109,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -189,7 +189,7 @@ index cbcd42decb2a..a2920cce2695 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1350,6 +1350,7 @@ config XEN +@@ -1351,6 +1351,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if ARM64_64K_PAGES @@ -1553,7 +1553,7 @@ index ee4da9ab8013..0f217997a764 100644 err_netlink: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 961a5f8a44d2..3b125b6a5eeb 100644 +index 79005ea1a33e..355445ee7956 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) diff --git a/sources b/sources index 0685fbe3d..55160a963 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-rc3-116-gf1baf68e1383.tar.xz) = 97be5083b0cdc1e904a8e4f8deb267d22e2c3010f7295838ec2ec877f79335a7a1eaa7fa53fbfa448fc13c7a6afc67ea454a4f5b2a08ed207c1ef4275162051b -SHA512 (kernel-abi-stablelists-5.17.0-0.rc3.20220211gitf1baf68e1383.93.tar.bz2) = ff7c846a237bd2e2a00af6d2cd7aa4d7e36ea00f6c39594553e9b0baf7feeead193dac459eb7aa5e7bcde8a6548d67d6e10d00268570275058b2ca8defad0cbd -SHA512 (kernel-kabi-dw-5.17.0-0.rc3.20220211gitf1baf68e1383.93.tar.bz2) = cfc68b2457ccd7deec9c329dbe3f49d06f539e409ac410ee360efc86378663f38ea01f52a6a6928d29f4474c4b632f3fad737256b2fde3c19cb62b8688e0fdaa +SHA512 (linux-5.17-rc4.tar.xz) = 68a2de9e99718c6f55d2cb17d774bb13adeb37a3b3dc5c4e9c23c8055c235ed7fa4456f3f9534a97485a9422120e473dd003f7036bbd4d031456d06f7837379e +SHA512 (kernel-abi-stablelists-5.17.0-0.rc4.96.tar.bz2) = 7a7a6065902e2431774842daae8b9127d4ee66872ec809925dd7976b3f7ccecc7b9bc06c86426fdbe8fa0ac08ba6bc6087fbb0acec9e08849762df462b43e1ef +SHA512 (kernel-kabi-dw-5.17.0-0.rc4.96.tar.bz2) = 89bbdca28bfd8e1b96a000d12be1acd31e0bcecac5662798bfc2ab65d2140563b33a741aacbf6ef0f97ff9a45fabb50ea937312d3e66eb3c9b7f41aa28dd2bf9