From 0c3495d26ee0f7f2b824d25ed3a73c33c37673b3 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Sat, 5 Mar 2022 13:07:25 +0100 Subject: kernel 5.16.12 --- SOURCES/Patchlist.changelog | 3 +++ SOURCES/kernel-aarch64-debug-fedora.config | 3 +-- SOURCES/kernel-aarch64-fedora.config | 3 +-- SOURCES/kernel-armv7hl-debug-fedora.config | 3 +-- SOURCES/kernel-armv7hl-fedora.config | 3 +-- SOURCES/kernel-armv7hl-lpae-debug-fedora.config | 3 +-- SOURCES/kernel-armv7hl-lpae-fedora.config | 3 +-- SOURCES/kernel-i686-debug-fedora.config | 3 +-- SOURCES/kernel-i686-fedora.config | 3 +-- SOURCES/kernel-ppc64le-debug-fedora.config | 3 +-- SOURCES/kernel-ppc64le-fedora.config | 3 +-- SOURCES/kernel-s390x-debug-fedora.config | 3 +-- SOURCES/kernel-s390x-fedora.config | 3 +-- SOURCES/kernel-x86_64-debug-fedora.config | 3 +-- SOURCES/kernel-x86_64-fedora.config | 3 +-- SOURCES/patch-5.16-redhat.patch | 21 ++++++++++++++++++--- SPECS/kernel.spec | 17 ++++++++++------- 17 files changed, 45 insertions(+), 38 deletions(-) diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog index af388f4..ce56ad1 100644 --- a/SOURCES/Patchlist.changelog +++ b/SOURCES/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/1c96abf3c7126a2fb24f689b1ffcdd6eda0ffdc6 + 1c96abf3c7126a2fb24f689b1ffcdd6eda0ffdc6 drm/nouveau/backlight: Fix LVDS backlight detection on some laptops + https://gitlab.com/cki-project/kernel-ark/-/commit/f02942b95fb601b9729da7be1ae55d2255dcc045 f02942b95fb601b9729da7be1ae55d2255dcc045 Revert "x86/PCI: Ignore E820 reservations for bridge windows on newer systems" diff --git a/SOURCES/kernel-aarch64-debug-fedora.config b/SOURCES/kernel-aarch64-debug-fedora.config index 35f7eea..cd64a9e 100644 --- a/SOURCES/kernel-aarch64-debug-fedora.config +++ b/SOURCES/kernel-aarch64-debug-fedora.config @@ -448,7 +448,7 @@ CONFIG_ARM_TIMER_SP804=y CONFIG_ARMV8_DEPRECATED=y # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_ASYNC_RAID6_TEST=m @@ -7632,7 +7632,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m CONFIG_TSL4531=m -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config index 5407cf3..eabda55 100644 --- a/SOURCES/kernel-aarch64-fedora.config +++ b/SOURCES/kernel-aarch64-fedora.config @@ -448,7 +448,7 @@ CONFIG_ARM_TIMER_SP804=y CONFIG_ARMV8_DEPRECATED=y # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_ASYNC_RAID6_TEST=m @@ -7606,7 +7606,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m CONFIG_TSL4531=m -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-armv7hl-debug-fedora.config b/SOURCES/kernel-armv7hl-debug-fedora.config index 62e85af..7545999 100644 --- a/SOURCES/kernel-armv7hl-debug-fedora.config +++ b/SOURCES/kernel-armv7hl-debug-fedora.config @@ -460,7 +460,7 @@ CONFIG_ARM=y CONFIG_ARM_ZYNQ_CPUIDLE=y # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_ASYNC_RAID6_TEST=m @@ -7838,7 +7838,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m CONFIG_TSL4531=m -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-armv7hl-fedora.config b/SOURCES/kernel-armv7hl-fedora.config index 503ab0a..7496c5f 100644 --- a/SOURCES/kernel-armv7hl-fedora.config +++ b/SOURCES/kernel-armv7hl-fedora.config @@ -460,7 +460,7 @@ CONFIG_ARM=y CONFIG_ARM_ZYNQ_CPUIDLE=y # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_ASYNC_RAID6_TEST=m @@ -7813,7 +7813,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m CONFIG_TSL4531=m -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config index 69ba7d9..279436f 100644 --- a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config @@ -450,7 +450,7 @@ CONFIG_ARM_VIRT_EXT=y CONFIG_ARM=y # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_ASYNC_RAID6_TEST=m @@ -7606,7 +7606,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m CONFIG_TSL4531=m -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-armv7hl-lpae-fedora.config b/SOURCES/kernel-armv7hl-lpae-fedora.config index da79b4e..aed4baf 100644 --- a/SOURCES/kernel-armv7hl-lpae-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-fedora.config @@ -450,7 +450,7 @@ CONFIG_ARM_VIRT_EXT=y CONFIG_ARM=y # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_ASYNC_RAID6_TEST=m @@ -7581,7 +7581,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m CONFIG_TSL4531=m -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-i686-debug-fedora.config b/SOURCES/kernel-i686-debug-fedora.config index b122700..a546bf6 100644 --- a/SOURCES/kernel-i686-debug-fedora.config +++ b/SOURCES/kernel-i686-debug-fedora.config @@ -308,7 +308,7 @@ CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASUS_LAPTOP=m CONFIG_ASUS_NB_WMI=m CONFIG_ASUS_WIRELESS=m @@ -6855,7 +6855,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m # CONFIG_TSL4531 is not set -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-i686-fedora.config b/SOURCES/kernel-i686-fedora.config index 0407111..5a26868 100644 --- a/SOURCES/kernel-i686-fedora.config +++ b/SOURCES/kernel-i686-fedora.config @@ -307,7 +307,7 @@ CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASUS_LAPTOP=m CONFIG_ASUS_NB_WMI=m CONFIG_ASUS_WIRELESS=m @@ -6830,7 +6830,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m # CONFIG_TSL4531 is not set -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-ppc64le-debug-fedora.config b/SOURCES/kernel-ppc64le-debug-fedora.config index 69d8544..cf56c0b 100644 --- a/SOURCES/kernel-ppc64le-debug-fedora.config +++ b/SOURCES/kernel-ppc64le-debug-fedora.config @@ -272,7 +272,7 @@ CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_ASYNC_RAID6_TEST=m @@ -6529,7 +6529,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m # CONFIG_TSL4531 is not set -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-ppc64le-fedora.config b/SOURCES/kernel-ppc64le-fedora.config index 9a1b06c..cd2a64e 100644 --- a/SOURCES/kernel-ppc64le-fedora.config +++ b/SOURCES/kernel-ppc64le-fedora.config @@ -271,7 +271,7 @@ CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_ASYNC_RAID6_TEST=m @@ -6503,7 +6503,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m # CONFIG_TSL4531 is not set -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-s390x-debug-fedora.config b/SOURCES/kernel-s390x-debug-fedora.config index 61fd572..065ac67 100644 --- a/SOURCES/kernel-s390x-debug-fedora.config +++ b/SOURCES/kernel-s390x-debug-fedora.config @@ -276,7 +276,7 @@ CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_ASYNC_RAID6_TEST=m @@ -6477,7 +6477,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m # CONFIG_TSL4531 is not set -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-s390x-fedora.config b/SOURCES/kernel-s390x-fedora.config index 1ea7e09..d936711 100644 --- a/SOURCES/kernel-s390x-fedora.config +++ b/SOURCES/kernel-s390x-fedora.config @@ -275,7 +275,7 @@ CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_ASYNC_RAID6_TEST=m @@ -6451,7 +6451,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m # CONFIG_TSL4531 is not set -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config index 89bd9c6..099a41d 100644 --- a/SOURCES/kernel-x86_64-debug-fedora.config +++ b/SOURCES/kernel-x86_64-debug-fedora.config @@ -310,7 +310,7 @@ CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASUS_LAPTOP=m CONFIG_ASUS_NB_WMI=m CONFIG_ASUS_WIRELESS=m @@ -6905,7 +6905,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m # CONFIG_TSL4531 is not set -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config index b153ac9..3742d74 100644 --- a/SOURCES/kernel-x86_64-fedora.config +++ b/SOURCES/kernel-x86_64-fedora.config @@ -309,7 +309,7 @@ CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y CONFIG_ASUS_LAPTOP=m CONFIG_ASUS_NB_WMI=m CONFIG_ASUS_WIRELESS=m @@ -6880,7 +6880,6 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2591 is not set CONFIG_TSL2772=m # CONFIG_TSL4531 is not set -# CONFIG_TSNEP_SELFTESTS is not set # CONFIG_TSYS01 is not set # CONFIG_TSYS02D is not set CONFIG_TULIP=m diff --git a/SOURCES/patch-5.16-redhat.patch b/SOURCES/patch-5.16-redhat.patch index 1ec61ee..7cd2e8b 100644 --- a/SOURCES/patch-5.16-redhat.patch +++ b/SOURCES/patch-5.16-redhat.patch @@ -17,6 +17,7 @@ drivers/firmware/efi/efi.c | 124 +++++++++++++++------ drivers/firmware/efi/secureboot.c | 38 +++++++ drivers/gpu/drm/i915/display/intel_psr.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 3 +- drivers/hid/hid-rmi.c | 64 ----------- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- @@ -47,10 +48,10 @@ security/lockdown/lockdown.c | 1 + security/security.c | 6 + tools/testing/selftests/netfilter/nft_nat.sh | 5 +- - 49 files changed, 805 insertions(+), 198 deletions(-) + 50 files changed, 807 insertions(+), 199 deletions(-) diff --git a/Makefile b/Makefile -index 00ba75768af7..f95367fb3134 100644 +index 09a9bb824afa..02a849fa625b 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -870,6 +871,20 @@ index 7a205fd5023b..42d57ebd9061 100644 return false; } +diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c +index 1cbd71abc80a..9d2513de959b 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c ++++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c +@@ -294,7 +294,8 @@ nv50_backlight_init(struct nouveau_backlight *bl, + struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev); + struct nvif_object *device = &drm->client.device.object; + +- if (!nvif_rd32(device, NV50_PDISP_SOR_PWM_CTL(ffs(nv_encoder->dcb->or) - 1))) ++ if (!nvif_rd32(device, NV50_PDISP_SOR_PWM_CTL(ffs(nv_encoder->dcb->or) - 1)) || ++ nv_conn->base.status != connector_status_connected) + return -ENODEV; + + if (nv_conn->type == DCB_CONNECTOR_eDP) { diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 311eee599ce9..2460c6bd46f8 100644 --- a/drivers/hid/hid-rmi.c @@ -1376,7 +1391,7 @@ index 4c348bacf2cb..9fe496d35b38 100644 soc_hw_version_major, soc_hw_version_minor); ret = -EOPNOTSUPP; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 352766aa3122..16a2c9417536 100644 +index 5785f6abf194..7fc5f15a4b78 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/SPECS/kernel.spec b/SPECS/kernel.spec index 675f6dd..c33c9e3 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -130,7 +130,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.16 -%define rpmversion 5.16.11 +%define rpmversion 5.16.12 %define patchversion 5.16 %define pkgrelease 201 @@ -692,7 +692,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16.11.tar.xz +Source0: linux-5.16.12.tar.xz Source1: Makefile.rhelver @@ -1395,8 +1395,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16.11 -c -mv linux-5.16.11 linux-%{KVERREL} +%setup -q -n kernel-5.16.12 -c +mv linux-5.16.12 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2131,7 +2131,7 @@ BuildKernel() { %ifnarch armv7hl # Generate vmlinux.h and put it to kernel-devel path - #bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h + bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h %endif # prune junk from kernel-devel @@ -3003,8 +3003,11 @@ fi # # %changelog -* Sun Feb 27 2022 Jan Drögehoff - 5.16.11-201 -- Linux v5.16.11 futex2 zen openrgb +* Sat Mar 05 2022 Jan Drögehoff - 5.16.12-201 +- Linux v5.16.12 futex2 zen openrgb + +* Wed Mar 02 2022 Justin M. Forbes [5.16.12-0] +- drm/nouveau/backlight: Fix LVDS backlight detection on some laptops (Lyude Paul) * Wed Feb 23 2022 Justin M. Forbes [5.16.11-0] - spec: don't overwrite auto.conf with .config (Ondrej Mosnacek) -- cgit v1.2.3