From cd5be03fded7ade485a122452d576127e0a0147f Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 10 Nov 2021 12:17:49 -0600 Subject: kernel-5.16-0.rc0.20211110gitcb690f5238d7.10 * Wed Nov 10 2021 Fedora Kernel Team [5.16-0.rc0.20211110gitcb690f5238d7.10] - arm64: cpufeature: Export this_cpu_has_cap helper (Arnd Bergmann) - drm/virtio: Fix NULL dereference error in virtio_gpu_poll (Vivek Kasireddy) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 8 ++++---- kernel-aarch64-debug-rhel.config | 3 ++- kernel-aarch64-rhel.config | 3 ++- kernel-ppc64le-debug-rhel.config | 3 ++- kernel-ppc64le-rhel.config | 3 ++- kernel-s390x-debug-rhel.config | 1 + kernel-s390x-rhel.config | 1 + kernel-s390x-zfcpdump-rhel.config | 1 + kernel-x86_64-debug-rhel.config | 3 ++- kernel-x86_64-rhel.config | 3 ++- kernel.spec | 19 +++++++++++-------- patch-5.16-redhat.patch | 6 +++--- sources | 6 +++--- 14 files changed, 37 insertions(+), 25 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 0c6a71d1c..d54c79cf4 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 = 9 +RHEL_RELEASE = 10 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index e923259e3..dc5ca97b6 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/ca3bff2fbfde026a32a900a47e61443e79f64464 - ca3bff2fbfde026a32a900a47e61443e79f64464 arm64: cpufeature: Export this_cpu_has_cap helper +https://gitlab.com/cki-project/kernel-ark/-/commit/22d78162a1ebd87197d6395e7b702033e6cd2905 + 22d78162a1ebd87197d6395e7b702033e6cd2905 arm64: cpufeature: Export this_cpu_has_cap helper -https://gitlab.com/cki-project/kernel-ark/-/commit/b7fc3a511b8d75b54b1bc4bd5f6a2d571bd00b5e - b7fc3a511b8d75b54b1bc4bd5f6a2d571bd00b5e drm/virtio: Fix NULL dereference error in virtio_gpu_poll +https://gitlab.com/cki-project/kernel-ark/-/commit/b3f61c9e2180aebee495c2f5e1389a8a1493bb0b + b3f61c9e2180aebee495c2f5e1389a8a1493bb0b drm/virtio: Fix NULL dereference error in virtio_gpu_poll https://gitlab.com/cki-project/kernel-ark/-/commit/07b3d9b051aa347237b4c637a1984c1915c750b2 07b3d9b051aa347237b4c637a1984c1915c750b2 Enable e1000 in rhel9 as unsupported diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index a6800173a..d1be73b22 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -10,8 +10,9 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_A11Y_BRAILLE_CONSOLE is not set # CONFIG_ABP060MG is not set -# CONFIG_ACCESSIBILITY is not set +CONFIG_ACCESSIBILITY=y # CONFIG_ACER_WIRELESS is not set # CONFIG_ACORN_PARTITION is not set CONFIG_ACPI_AC=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 8f44cceec..5b5dc0212 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -10,8 +10,9 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_A11Y_BRAILLE_CONSOLE is not set # CONFIG_ABP060MG is not set -# CONFIG_ACCESSIBILITY is not set +CONFIG_ACCESSIBILITY=y # CONFIG_ACER_WIRELESS is not set # CONFIG_ACORN_PARTITION is not set CONFIG_ACPI_AC=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index db647ddd1..22bed7188 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -11,8 +11,9 @@ CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set CONFIG_842_DECOMPRESS=y +# CONFIG_A11Y_BRAILLE_CONSOLE is not set # CONFIG_ABP060MG is not set -# CONFIG_ACCESSIBILITY is not set +CONFIG_ACCESSIBILITY=y # CONFIG_ACER_WIRELESS is not set # CONFIG_ACORN_PARTITION is not set CONFIG_ACPI_AC=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 87e9f65ac..ead300854 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -11,8 +11,9 @@ CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set CONFIG_842_DECOMPRESS=y +# CONFIG_A11Y_BRAILLE_CONSOLE is not set # CONFIG_ABP060MG is not set -# CONFIG_ACCESSIBILITY is not set +CONFIG_ACCESSIBILITY=y # CONFIG_ACER_WIRELESS is not set # CONFIG_ACORN_PARTITION is not set CONFIG_ACPI_AC=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 8686d5f53..ec5da191b 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -10,6 +10,7 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_A11Y_BRAILLE_CONSOLE is not set # CONFIG_ABP060MG is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_ACER_WIRELESS is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index af11eaeba..d1ebadcfe 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -10,6 +10,7 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_A11Y_BRAILLE_CONSOLE is not set # CONFIG_ABP060MG is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_ACER_WIRELESS is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 6d52d48e3..b134d250b 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -10,6 +10,7 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_A11Y_BRAILLE_CONSOLE is not set # CONFIG_ABP060MG is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_ACER_WIRELESS is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index a24545cb3..53a3ddb3c 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -10,8 +10,9 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_A11Y_BRAILLE_CONSOLE is not set # CONFIG_ABP060MG is not set -# CONFIG_ACCESSIBILITY is not set +CONFIG_ACCESSIBILITY=y # CONFIG_ACERHDF is not set # CONFIG_ACER_WIRELESS is not set CONFIG_ACER_WMI=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 5d60cda8d..bb4fa79b7 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -10,8 +10,9 @@ CONFIG_8139TOO_8129=y CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_A11Y_BRAILLE_CONSOLE is not set # CONFIG_ABP060MG is not set -# CONFIG_ACCESSIBILITY is not set +CONFIG_ACCESSIBILITY=y # CONFIG_ACERHDF is not set # CONFIG_ACER_WIRELESS is not set CONFIG_ACER_WMI=m diff --git a/kernel.spec b/kernel.spec index 00e8d9fe1..cefaecb60 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc0.20211109gitd2f38a3c6507.9 +%global distro_build 0.rc0.20211110gitcb690f5238d7.10 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -130,13 +130,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc0.20211109gitd2f38a3c6507.9 +%define pkgrelease 0.rc0.20211110gitcb690f5238d7.10 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20211109gitd2f38a3c6507.9%{?buildid}%{?dist} +%define specrelease 0.rc0.20211110gitcb690f5238d7.10%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -682,7 +682,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-11645-gd2f38a3c6507.tar.xz +Source0: linux-5.15-11863-gcb690f5238d7.tar.xz Source1: Makefile.rhelver @@ -1374,8 +1374,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-11645-gd2f38a3c6507 -c -mv linux-5.15-11645-gd2f38a3c6507 linux-%{KVERREL} +%setup -q -n kernel-5.15-11863-gcb690f5238d7 -c +mv linux-5.15-11863-gcb690f5238d7 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2184,7 +2184,7 @@ InitBuildVars %global perf_build_extra_opts CORESIGHT=1 %endif %global perf_make \ - %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} + %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} # perf # make sure check-headers.sh is executable @@ -2972,10 +2972,13 @@ fi # # %changelog -* Tue Nov 09 2021 Fedora Kernel Team [5.16-0.rc0.20211109gitd2f38a3c6507.9] +* Wed Nov 10 2021 Fedora Kernel Team [5.16-0.rc0.20211110gitcb690f5238d7.10] - arm64: cpufeature: Export this_cpu_has_cap helper (Arnd Bergmann) - drm/virtio: Fix NULL dereference error in virtio_gpu_poll (Vivek Kasireddy) +* Wed Nov 10 2021 Fedora Kernel Team [5.16-0.rc0.20211110gitcb690f5238d7.9] +- redhat: configs: move CONFIG_ACCESSIBILITY from fedora to common (John W. Linville) + * Tue Nov 09 2021 Fedora Kernel Team [5.16-0.rc0.20211109gitd2f38a3c6507.8] - Filter updates for hid-playstation on Fedora (Justin M. Forbes) - Revert "Force DWARF4 because crash does not support DWARF5 yet" (Lianbo Jiang) diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index ddee6ef39..93610d518 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -1583,7 +1583,7 @@ index 75dbe77b0b4b..029ff8576f8e 100644 err_netlink: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 838b5e2058be..2598901296f2 100644 +index 4b5de8f5435a..798e401a2196 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) @@ -2193,10 +2193,10 @@ index 6b5d36babfcc..fd4a5d66a9d0 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index e5359b09de1d..60b097643f45 100644 +index 968b4c4fe65b..4c34135b7fee 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -530,4 +530,21 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } +@@ -495,4 +495,21 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } /* OTHER_WRITABLE? Generally considered a bad idea. */ \ BUILD_BUG_ON_ZERO((perms) & 2) + \ (perms)) diff --git a/sources b/sources index a715b0a69..3bb313b00 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.15-11645-gd2f38a3c6507.tar.xz) = 32ccfee21d0b221037696e392623981511457258627e565faa084022d749069551b85406707782ea06d9308938316c6170d983f875b4e0876acb7a6ad6090967 -SHA512 (kernel-abi-stablelists-5.16.0-0.rc0.20211109gitd2f38a3c6507.9.tar.bz2) = 4702190598df5439774e01ad2071dff075d989a60e7356f3c85f1a5a4cb692a0ee43d728371c690eb4f2161fcb0ce1ff4b5f14fa3891d74de1f8293cb7f0ebb7 -SHA512 (kernel-kabi-dw-5.16.0-0.rc0.20211109gitd2f38a3c6507.9.tar.bz2) = 8e06c53dd3b27a3980c9cbbfca86b12ddff0961c1534b56dc6bc292752dfa3dca455a5adbce56c559a4470563df868c62dec76d4ff06df474eef2392e22f8917 +SHA512 (linux-5.15-11863-gcb690f5238d7.tar.xz) = 6c14780cc8161ff66c21f621572d7a6ebfc72b6c95c7fad9f04ee3809b270e10849009cc8bc236bff22bc29417df5210f3f66076743cbf2646a0253126f58a26 +SHA512 (kernel-abi-stablelists-5.16.0-0.rc0.20211110gitcb690f5238d7.10.tar.bz2) = e9ff23edb5c3b48e02d69c9313f1f6904c4262bcaf031f664e3ff13d11087158013d24c3dba3f71eaa0f707ff9a2cf59dbacb60ee1eba6c6ffcedd514f7d9731 +SHA512 (kernel-kabi-dw-5.16.0-0.rc0.20211110gitcb690f5238d7.10.tar.bz2) = 4629798e31ddfb6f2077a5d7ea0ec0b85609be5f760e48e26f4db7b7da1fade7e7825b124eab2c8dbe58dedbdf6b54601580937933a26213f067bb60240f81c4 -- cgit From f0005b333789fa95a42519327ea781c25ae8eb19 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 11 Nov 2021 10:00:54 -0600 Subject: kernel-5.16-0.rc0.20211111gitdebe436e77c7.11 * Thu Nov 11 2021 Fedora Kernel Team [5.16-0.rc0.20211111gitdebe436e77c7.11] - arm64: cpufeature: Export this_cpu_has_cap helper (Arnd Bergmann) - drm/virtio: Fix NULL dereference error in virtio_gpu_poll (Vivek Kasireddy) 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 | 19 +++++++++++-------- patch-5.16-redhat.patch | 18 +++++++++--------- sources | 6 +++--- 19 files changed, 56 insertions(+), 25 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index d54c79cf4..4f1fce49c 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 = 10 +RHEL_RELEASE = 11 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index dc5ca97b6..8075291b1 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/22d78162a1ebd87197d6395e7b702033e6cd2905 - 22d78162a1ebd87197d6395e7b702033e6cd2905 arm64: cpufeature: Export this_cpu_has_cap helper +https://gitlab.com/cki-project/kernel-ark/-/commit/08976b7add73a184cbe339aadd9bb83b0c0d6800 + 08976b7add73a184cbe339aadd9bb83b0c0d6800 arm64: cpufeature: Export this_cpu_has_cap helper -https://gitlab.com/cki-project/kernel-ark/-/commit/b3f61c9e2180aebee495c2f5e1389a8a1493bb0b - b3f61c9e2180aebee495c2f5e1389a8a1493bb0b drm/virtio: Fix NULL dereference error in virtio_gpu_poll +https://gitlab.com/cki-project/kernel-ark/-/commit/9263342d48cdaad8a46fa002b7676e9571ce70a9 + 9263342d48cdaad8a46fa002b7676e9571ce70a9 drm/virtio: Fix NULL dereference error in virtio_gpu_poll https://gitlab.com/cki-project/kernel-ark/-/commit/07b3d9b051aa347237b4c637a1984c1915c750b2 07b3d9b051aa347237b4c637a1984c1915c750b2 Enable e1000 in rhel9 as unsupported diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 927349a6f..4e26e2f00 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2938,6 +2938,7 @@ CONFIG_IMX7D_ADC=m CONFIG_IMX8MM_THERMAL=m # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m +# CONFIG_IMX_DSP_REMOTEPROC is not set CONFIG_IMX_GPCV2_PM_DOMAINS=y CONFIG_IMX_GPCV2=y # CONFIG_IMX_IPUV3_CORE is not set @@ -3903,6 +3904,7 @@ CONFIG_MESON_GXL_PHY=m CONFIG_MESON_GX_PM_DOMAINS=y CONFIG_MESON_GX_SOCINFO=y CONFIG_MESON_IRQ_GPIO=y +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set # CONFIG_MESON_MX_EFUSE is not set # CONFIG_MESON_MX_SOCINFO is not set CONFIG_MESON_SARADC=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 5ef9e1d2f..1d517f16a 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2922,6 +2922,7 @@ CONFIG_IMX7D_ADC=m CONFIG_IMX8MM_THERMAL=m # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m +# CONFIG_IMX_DSP_REMOTEPROC is not set CONFIG_IMX_GPCV2_PM_DOMAINS=y CONFIG_IMX_GPCV2=y # CONFIG_IMX_IPUV3_CORE is not set @@ -3879,6 +3880,7 @@ CONFIG_MESON_GXL_PHY=m CONFIG_MESON_GX_PM_DOMAINS=y CONFIG_MESON_GX_SOCINFO=y CONFIG_MESON_IRQ_GPIO=y +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set # CONFIG_MESON_MX_EFUSE is not set # CONFIG_MESON_MX_SOCINFO is not set CONFIG_MESON_SARADC=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 643b4392d..c7c1899ed 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2962,6 +2962,7 @@ CONFIG_IMX7D_ADC=m CONFIG_IMX8MM_THERMAL=m # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m +# CONFIG_IMX_DSP_REMOTEPROC is not set CONFIG_IMX_GPCV2_PM_DOMAINS=y CONFIG_IMX_GPCV2=y CONFIG_IMX_IPUV3_CORE=m @@ -3960,6 +3961,7 @@ CONFIG_MESON_EFUSE=m # CONFIG_MESON_GX_PM_DOMAINS is not set CONFIG_MESON_GX_SOCINFO=y CONFIG_MESON_IRQ_GPIO=y +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_MESON_MX_EFUSE=m CONFIG_MESON_MX_SOCINFO=y CONFIG_MESON_SARADC=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index f21a10303..e980974e9 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2947,6 +2947,7 @@ CONFIG_IMX7D_ADC=m CONFIG_IMX8MM_THERMAL=m # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m +# CONFIG_IMX_DSP_REMOTEPROC is not set CONFIG_IMX_GPCV2_PM_DOMAINS=y CONFIG_IMX_GPCV2=y CONFIG_IMX_IPUV3_CORE=m @@ -3937,6 +3938,7 @@ CONFIG_MESON_EFUSE=m # CONFIG_MESON_GX_PM_DOMAINS is not set CONFIG_MESON_GX_SOCINFO=y CONFIG_MESON_IRQ_GPIO=y +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_MESON_MX_EFUSE=m CONFIG_MESON_MX_SOCINFO=y CONFIG_MESON_SARADC=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index aa689b682..8129f0eb4 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2905,6 +2905,7 @@ CONFIG_IMX7D_ADC=m CONFIG_IMX8MM_THERMAL=m # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m +# CONFIG_IMX_DSP_REMOTEPROC is not set CONFIG_IMX_GPCV2_PM_DOMAINS=y CONFIG_IMX_GPCV2=y # CONFIG_IMX_IPUV3_CORE is not set @@ -3877,6 +3878,7 @@ CONFIG_MESON_EFUSE=m # CONFIG_MESON_GX_PM_DOMAINS is not set CONFIG_MESON_GX_SOCINFO=y CONFIG_MESON_IRQ_GPIO=y +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_MESON_MX_EFUSE=m CONFIG_MESON_MX_SOCINFO=y CONFIG_MESON_SARADC=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index efc910a1d..c24d0e107 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2890,6 +2890,7 @@ CONFIG_IMX7D_ADC=m CONFIG_IMX8MM_THERMAL=m # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m +# CONFIG_IMX_DSP_REMOTEPROC is not set CONFIG_IMX_GPCV2_PM_DOMAINS=y CONFIG_IMX_GPCV2=y # CONFIG_IMX_IPUV3_CORE is not set @@ -3854,6 +3855,7 @@ CONFIG_MESON_EFUSE=m # CONFIG_MESON_GX_PM_DOMAINS is not set CONFIG_MESON_GX_SOCINFO=y CONFIG_MESON_IRQ_GPIO=y +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_MESON_MX_EFUSE=m CONFIG_MESON_MX_SOCINFO=y CONFIG_MESON_SARADC=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 7bc0e85bb..1fa116c28 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -2574,6 +2574,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_DSP_REMOTEPROC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESPINTCP=y @@ -3540,6 +3541,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set # CONFIG_MERAKI_MX100 is not set +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index f3595fcde..00f38cadc 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -2557,6 +2557,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_DSP_REMOTEPROC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESPINTCP=y @@ -3517,6 +3518,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set # CONFIG_MERAKI_MX100 is not set +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 972fd0f03..c9fbae77a 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2415,6 +2415,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_DSP_REMOTEPROC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESPINTCP=y @@ -3308,6 +3309,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set # CONFIG_MERAKI_MX100 is not set +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 4dd1a462b..427cbc247 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2398,6 +2398,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_DSP_REMOTEPROC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESPINTCP=y @@ -3284,6 +3285,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set # CONFIG_MERAKI_MX100 is not set +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index ccc40c701..1ffde1d2d 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2395,6 +2395,7 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_DSP_REMOTEPROC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESPINTCP=y @@ -3291,6 +3292,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set # CONFIG_MERAKI_MX100 is not set +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index ea981f4f6..ec9e39bb3 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2378,6 +2378,7 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_DSP_REMOTEPROC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESPINTCP=y @@ -3267,6 +3268,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set # CONFIG_MERAKI_MX100 is not set +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 1621204f5..f35750940 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2619,6 +2619,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_DSP_REMOTEPROC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESPINTCP=y @@ -3592,6 +3593,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set # CONFIG_MERAKI_MX100 is not set +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index e61274ce1..26ad823f5 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2602,6 +2602,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_DSP_REMOTEPROC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESPINTCP=y @@ -3569,6 +3570,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set # CONFIG_MERAKI_MX100 is not set +# CONFIG_MESON_MX_AO_ARC_REMOTEPROC is not set CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set diff --git a/kernel.spec b/kernel.spec index cefaecb60..fc810e834 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc0.20211110gitcb690f5238d7.10 +%global distro_build 0.rc0.20211111gitdebe436e77c7.11 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -130,13 +130,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc0.20211110gitcb690f5238d7.10 +%define pkgrelease 0.rc0.20211111gitdebe436e77c7.11 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20211110gitcb690f5238d7.10%{?buildid}%{?dist} +%define specrelease 0.rc0.20211111gitdebe436e77c7.11%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -682,7 +682,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-11863-gcb690f5238d7.tar.xz +Source0: linux-5.15-12267-gdebe436e77c7.tar.xz Source1: Makefile.rhelver @@ -1374,8 +1374,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-11863-gcb690f5238d7 -c -mv linux-5.15-11863-gcb690f5238d7 linux-%{KVERREL} +%setup -q -n kernel-5.15-12267-gdebe436e77c7 -c +mv linux-5.15-12267-gdebe436e77c7 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2184,7 +2184,7 @@ InitBuildVars %global perf_build_extra_opts CORESIGHT=1 %endif %global perf_make \ - %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} + %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} # perf # make sure check-headers.sh is executable @@ -2972,10 +2972,13 @@ fi # # %changelog -* Wed Nov 10 2021 Fedora Kernel Team [5.16-0.rc0.20211110gitcb690f5238d7.10] +* Thu Nov 11 2021 Fedora Kernel Team [5.16-0.rc0.20211111gitdebe436e77c7.11] - arm64: cpufeature: Export this_cpu_has_cap helper (Arnd Bergmann) - drm/virtio: Fix NULL dereference error in virtio_gpu_poll (Vivek Kasireddy) +* Thu Nov 11 2021 Fedora Kernel Team [5.16-0.rc0.20211111gitdebe436e77c7.10] +- Add rebase notes to check for PCI patches (Justin M. Forbes) + * Wed Nov 10 2021 Fedora Kernel Team [5.16-0.rc0.20211110gitcb690f5238d7.9] - redhat: configs: move CONFIG_ACCESSIBILITY from fedora to common (John W. Linville) diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index 93610d518..24819d9b7 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -77,10 +77,10 @@ 76 files changed, 1384 insertions(+), 189 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 0905d2cdb2d5..a433eaa1ab66 100644 +index 9725c546a0d4..4d440bdcf5b9 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5922,6 +5922,15 @@ +@@ -5936,6 +5936,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -213,10 +213,10 @@ index f3851724fe35..ef69eeab6f2a 100644 static int __init parse_acpi(char *arg) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c -index ecbdff795f5e..646662407a07 100644 +index 7de96196ae14..6f3e677d88f1 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c -@@ -2864,6 +2864,7 @@ bool this_cpu_has_cap(unsigned int n) +@@ -2868,6 +2868,7 @@ bool this_cpu_has_cap(unsigned int n) return false; } @@ -558,10 +558,10 @@ index c68e694fca26..146cba5ae5bc 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index dce2c291b982..e047edc644e8 100644 +index a50f1967c73d..faeecb8bc471 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1721,6 +1721,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1725,6 +1725,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) return false; @@ -2079,10 +2079,10 @@ index 86658a81d284..5647f4756e97 100644 * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index a320c54202d9..bd1e167436f4 100644 +index 4e33b5eca694..b480ca4934de 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -4305,6 +4305,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) +@@ -4304,6 +4304,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) set_bit(EXT4_FLAGS_BDEV_IS_DAX, &sbi->s_ext4_flags); if (sbi->s_mount_opt & EXT4_MOUNT_DAX_ALWAYS) { @@ -2090,7 +2090,7 @@ index a320c54202d9..bd1e167436f4 100644 if (ext4_has_feature_inline_data(sb)) { ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem" " that may contain inline data"); -@@ -4315,6 +4316,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) +@@ -4314,6 +4315,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) "DAX unsupported by block device."); goto failed_mount; } diff --git a/sources b/sources index 3bb313b00..cf0d55c60 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.15-11863-gcb690f5238d7.tar.xz) = 6c14780cc8161ff66c21f621572d7a6ebfc72b6c95c7fad9f04ee3809b270e10849009cc8bc236bff22bc29417df5210f3f66076743cbf2646a0253126f58a26 -SHA512 (kernel-abi-stablelists-5.16.0-0.rc0.20211110gitcb690f5238d7.10.tar.bz2) = e9ff23edb5c3b48e02d69c9313f1f6904c4262bcaf031f664e3ff13d11087158013d24c3dba3f71eaa0f707ff9a2cf59dbacb60ee1eba6c6ffcedd514f7d9731 -SHA512 (kernel-kabi-dw-5.16.0-0.rc0.20211110gitcb690f5238d7.10.tar.bz2) = 4629798e31ddfb6f2077a5d7ea0ec0b85609be5f760e48e26f4db7b7da1fade7e7825b124eab2c8dbe58dedbdf6b54601580937933a26213f067bb60240f81c4 +SHA512 (linux-5.15-12267-gdebe436e77c7.tar.xz) = aab85f56390077bf1af6c2c67213e0e2e778206844ecb2b73b6c60add240a058573e7157331bfc5ce76dc4a092f287582f70ccb65a1d1a3612b078ef8653f4b6 +SHA512 (kernel-abi-stablelists-5.16.0-0.rc0.20211111gitdebe436e77c7.11.tar.bz2) = 94017a06d8fa9d90e5bf4cd5236614a3042318a392b793fed7f39c34ca0e5292305c3c543044dd017c512aea75bb8c1e75cd7a7d58d042ada65850324d3f3603 +SHA512 (kernel-kabi-dw-5.16.0-0.rc0.20211111gitdebe436e77c7.11.tar.bz2) = 3cb0391fd29ae297344c36fd9e1c5030d328a762391c5ed4c5091d5087b406bfbc044ba1d7073b94e81ff4fd653158e160052470b83a5638bf4d36fed89c7420 -- cgit From 9f3c08456ef98d2431791504bd2e4174ee407fd6 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 12 Nov 2021 08:09:06 -0600 Subject: kernel-5.16-0.rc0.20211112git5833291ab6de.12 * Fri Nov 12 2021 Fedora Kernel Team [5.16-0.rc0.20211112git5833291ab6de.12] - drm/virtio: Fix NULL dereference error in virtio_gpu_poll (Vivek Kasireddy) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 7 ++----- kernel.spec | 15 +++++++-------- patch-5.16-redhat.patch | 37 ++++++++++++------------------------- sources | 6 +++--- 5 files changed, 25 insertions(+), 42 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 4f1fce49c..92236dda5 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 = 11 +RHEL_RELEASE = 12 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 8075291b1..4834f2251 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/08976b7add73a184cbe339aadd9bb83b0c0d6800 - 08976b7add73a184cbe339aadd9bb83b0c0d6800 arm64: cpufeature: Export this_cpu_has_cap helper - -https://gitlab.com/cki-project/kernel-ark/-/commit/9263342d48cdaad8a46fa002b7676e9571ce70a9 - 9263342d48cdaad8a46fa002b7676e9571ce70a9 drm/virtio: Fix NULL dereference error in virtio_gpu_poll +https://gitlab.com/cki-project/kernel-ark/-/commit/3da0ae07e0d2d55fb4eb313ec6dc721ceb5439de + 3da0ae07e0d2d55fb4eb313ec6dc721ceb5439de drm/virtio: Fix NULL dereference error in virtio_gpu_poll https://gitlab.com/cki-project/kernel-ark/-/commit/07b3d9b051aa347237b4c637a1984c1915c750b2 07b3d9b051aa347237b4c637a1984c1915c750b2 Enable e1000 in rhel9 as unsupported diff --git a/kernel.spec b/kernel.spec index fc810e834..cccbe2927 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc0.20211111gitdebe436e77c7.11 +%global distro_build 0.rc0.20211112git5833291ab6de.12 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -130,13 +130,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc0.20211111gitdebe436e77c7.11 +%define pkgrelease 0.rc0.20211112git5833291ab6de.12 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20211111gitdebe436e77c7.11%{?buildid}%{?dist} +%define specrelease 0.rc0.20211112git5833291ab6de.12%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -682,7 +682,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-12267-gdebe436e77c7.tar.xz +Source0: linux-5.15-12452-g5833291ab6de.tar.xz Source1: Makefile.rhelver @@ -1374,8 +1374,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-12267-gdebe436e77c7 -c -mv linux-5.15-12267-gdebe436e77c7 linux-%{KVERREL} +%setup -q -n kernel-5.15-12452-g5833291ab6de -c +mv linux-5.15-12452-g5833291ab6de linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2972,8 +2972,7 @@ fi # # %changelog -* Thu Nov 11 2021 Fedora Kernel Team [5.16-0.rc0.20211111gitdebe436e77c7.11] -- arm64: cpufeature: Export this_cpu_has_cap helper (Arnd Bergmann) +* Fri Nov 12 2021 Fedora Kernel Team [5.16-0.rc0.20211112git5833291ab6de.12] - drm/virtio: Fix NULL dereference error in virtio_gpu_poll (Vivek Kasireddy) * Thu Nov 11 2021 Fedora Kernel Team [5.16-0.rc0.20211111gitdebe436e77c7.10] diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index 24819d9b7..b18b85b0a 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -5,7 +5,6 @@ arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 3 +- arch/arm64/kernel/acpi.c | 4 + - arch/arm64/kernel/cpufeature.c | 1 + arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + @@ -74,7 +73,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 76 files changed, 1384 insertions(+), 189 deletions(-) + 75 files changed, 1383 insertions(+), 189 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 9725c546a0d4..4d440bdcf5b9 100644 @@ -212,18 +211,6 @@ index f3851724fe35..ef69eeab6f2a 100644 static bool param_acpi_force __initdata; static int __init parse_acpi(char *arg) -diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c -index 7de96196ae14..6f3e677d88f1 100644 ---- a/arch/arm64/kernel/cpufeature.c -+++ b/arch/arm64/kernel/cpufeature.c -@@ -2868,6 +2868,7 @@ bool this_cpu_has_cap(unsigned int n) - - return false; - } -+EXPORT_SYMBOL_GPL(this_cpu_has_cap); - - /* - * This helper function is used in a narrow window when, diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h index 3f8ee257f9aa..3ab92feb6241 100644 --- a/arch/s390/include/asm/ipl.h @@ -1719,7 +1706,7 @@ index b334af8aa264..b2a0e2fc6d47 100644 { } diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index 1d98c974381c..b442f6927ec0 100644 +index 588588cfda48..1b90c69b7718 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -19,6 +19,7 @@ @@ -2219,10 +2206,10 @@ index 968b4c4fe65b..4c34135b7fee 100644 + #endif diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index a9ac70ae01ab..9bbf62267622 100644 +index 442a611fa0fb..45b98d102e61 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h -@@ -395,6 +395,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) +@@ -397,6 +397,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) #endif /* CONFIG_BPF_SYSCALL */ LSM_HOOK(int, 0, locked_down, enum lockdown_reason what) @@ -2232,10 +2219,10 @@ index a9ac70ae01ab..9bbf62267622 100644 #ifdef CONFIG_PERF_EVENTS LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h -index 0bada4df23fc..3bee971d0b1e 100644 +index d6823214d5c1..c927853f0732 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h -@@ -1548,6 +1548,12 @@ +@@ -1553,6 +1553,12 @@ * * @what: kernel feature being accessed * @@ -2291,10 +2278,10 @@ index f5844908a089..901d51012738 100644 struct taint_flag { diff --git a/include/linux/pci.h b/include/linux/pci.h -index c8afbee5da4b..122c0b5473fe 100644 +index 138d764c1c35..ab6ba4f105f6 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1475,6 +1475,10 @@ int pci_add_dynid(struct pci_driver *drv, +@@ -1476,6 +1476,10 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); @@ -2646,7 +2633,7 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index 7e0ba63b5dde..5ab6ceaa2589 100644 +index 06eac4e61a13..afbb845f8203 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -473,6 +473,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); @@ -2669,7 +2656,7 @@ index 7e0ba63b5dde..5ab6ceaa2589 100644 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) diff --git a/init/Kconfig b/init/Kconfig -index 21b1f4870c80..5e82f7f77abd 100644 +index 45bcaa8e7481..e0c1399a1a2c 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1648,7 +1648,7 @@ config AIO @@ -3061,10 +3048,10 @@ index 87cbdc64d272..18555cf18da7 100644 static int __init lockdown_lsm_init(void) diff --git a/security/security.c b/security/security.c -index 95e30fadba78..ee2beb206700 100644 +index 779a9edea0a0..08fd8f49ad3a 100644 --- a/security/security.c +++ b/security/security.c -@@ -2600,6 +2600,12 @@ int security_locked_down(enum lockdown_reason what) +@@ -2607,6 +2607,12 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); diff --git a/sources b/sources index cf0d55c60..cec5c0bac 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.15-12267-gdebe436e77c7.tar.xz) = aab85f56390077bf1af6c2c67213e0e2e778206844ecb2b73b6c60add240a058573e7157331bfc5ce76dc4a092f287582f70ccb65a1d1a3612b078ef8653f4b6 -SHA512 (kernel-abi-stablelists-5.16.0-0.rc0.20211111gitdebe436e77c7.11.tar.bz2) = 94017a06d8fa9d90e5bf4cd5236614a3042318a392b793fed7f39c34ca0e5292305c3c543044dd017c512aea75bb8c1e75cd7a7d58d042ada65850324d3f3603 -SHA512 (kernel-kabi-dw-5.16.0-0.rc0.20211111gitdebe436e77c7.11.tar.bz2) = 3cb0391fd29ae297344c36fd9e1c5030d328a762391c5ed4c5091d5087b406bfbc044ba1d7073b94e81ff4fd653158e160052470b83a5638bf4d36fed89c7420 +SHA512 (linux-5.15-12452-g5833291ab6de.tar.xz) = 5ea9f6f6692c3c6e36c3b6306621defcc40afea9df718980d372fa7eecdcc1405e488d58962becbd94a45afceeeff1dfb2215d53bdb200251e56ff140426d1ed +SHA512 (kernel-abi-stablelists-5.16.0-0.rc0.20211112git5833291ab6de.12.tar.bz2) = 3341442e0035ea3ec49463db2b52287eac9b3cb88c0add2976e30f8d974e570885ba8d06fc3f88e3c6aee01e4725be2cde97f37f222119496464dc3b1b247de0 +SHA512 (kernel-kabi-dw-5.16.0-0.rc0.20211112git5833291ab6de.12.tar.bz2) = 6459cc1b1c18a4c986d34f96079c1ccaf7b1113733ca36d08123cb45b6c9f8e3b393e5e44d6446ef83e3ccb6e26df2afc116135903079fc4276ae8287def9def -- cgit