From 9628f8dddc63687b6c67569ae48adf0bf3bee93a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sat, 25 Feb 2023 17:37:56 -0600 Subject: [PATCH 01/87] kernel-6.2.1-300 * Sat Feb 25 2023 Justin M. Forbes [6.2.1-0] - Add UKI revert patch to allow builds on F36 and F37 (Justin M. Forbes) - Turn E1000 back on (Justin M. Forbes) - More files for stable Fedora (Justin M. Forbes) - Update Makefile.variables for stable releases (Justin M. Forbes) - drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas) - enable efifb for Nvidia (Justin M. Forbes) - Fix up configs for dropped patches (Justin M. Forbes) - Reset RHEL_RELEASE to 0 for the 6.3 cycle (Justin M. Forbes) - redhat/configs: Enable CONFIG_V4L_TEST_DRIVERS related drivers (Enric Balletbo i Serra) - Linux v6.2.1 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 372 ++----- kernel-aarch64-debug-fedora.config | 17 +- kernel-aarch64-debug-rhel.config | 1 - kernel-aarch64-fedora.config | 17 +- kernel-aarch64-rhel.config | 1 - kernel-armv7hl-debug-fedora.config | 17 +- kernel-armv7hl-fedora.config | 17 +- kernel-armv7hl-lpae-debug-fedora.config | 17 +- kernel-armv7hl-lpae-fedora.config | 17 +- kernel-ppc64le-debug-fedora.config | 17 +- kernel-ppc64le-debug-rhel.config | 1 - kernel-ppc64le-fedora.config | 17 +- kernel-ppc64le-rhel.config | 1 - kernel-s390x-debug-fedora.config | 17 +- kernel-s390x-debug-rhel.config | 1 - kernel-s390x-fedora.config | 17 +- kernel-s390x-rhel.config | 1 - kernel-s390x-zfcpdump-rhel.config | 1 - kernel-x86_64-debug-fedora.config | 19 +- kernel-x86_64-debug-rhel.config | 3 +- kernel-x86_64-fedora.config | 19 +- kernel-x86_64-rhel.config | 3 +- kernel.spec | 24 +- patch-6.2-redhat.patch | 1303 +---------------------- redhatsecureboot003.cer | Bin 829 -> 0 bytes redhatsecureboot301.cer | Bin 0 -> 899 bytes redhatsecureboot401.cer | Bin 978 -> 0 bytes redhatsecureboot501.cer | Bin 0 -> 964 bytes redhatsecurebootca1.cer | Bin 0 -> 977 bytes redhatsecurebootca2.cer | Bin 872 -> 0 bytes redhatsecurebootca4.cer | Bin 934 -> 0 bytes redhatsecurebootca5.cer | Bin 0 -> 920 bytes secureboot_ppc.cer | Bin 0 -> 899 bytes secureboot_s390.cer | Bin 0 -> 899 bytes sources | 6 +- 36 files changed, 334 insertions(+), 1594 deletions(-) delete mode 100644 redhatsecureboot003.cer create mode 100644 redhatsecureboot301.cer delete mode 100644 redhatsecureboot401.cer create mode 100644 redhatsecureboot501.cer create mode 100644 redhatsecurebootca1.cer delete mode 100644 redhatsecurebootca2.cer delete mode 100644 redhatsecurebootca4.cer create mode 100644 redhatsecurebootca5.cer create mode 100644 secureboot_ppc.cer create mode 100644 secureboot_s390.cer diff --git a/Makefile.rhelver b/Makefile.rhelver index d8ba03632..bedf1e208 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 = 63 +RHEL_RELEASE = 0 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index d0c7ee503..3c2ae8e4c 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,318 +1,162 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/1c4eac94136bf04ed3def1a58778e728be3c19dd - 1c4eac94136bf04ed3def1a58778e728be3c19dd kernel/rh_messages.c: gcc12 warning on redundant NULL test +"https://gitlab.com/cki-project/kernel-ark/-/commit"/807d6b912b28183332ea9e78afaf9bc2f47559dd + 807d6b912b28183332ea9e78afaf9bc2f47559dd drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set -"https://gitlab.com/cki-project/kernel-ark/-/commit"/77542637f2e84a847a7886979e0613332695c181 - 77542637f2e84a847a7886979e0613332695c181 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev +"https://gitlab.com/cki-project/kernel-ark/-/commit"/debd5d3d648d17cd57a04a845e88f798861aa3a2 + debd5d3d648d17cd57a04a845e88f798861aa3a2 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev -"https://gitlab.com/cki-project/kernel-ark/-/commit"/93facc56f644fd9177fcad53576d50c88ae0f5ed - 93facc56f644fd9177fcad53576d50c88ae0f5ed Revert "crypto: rng - Override drivers/char/random in FIPS mode" +"https://gitlab.com/cki-project/kernel-ark/-/commit"/48c32ba53b5c5e132349e49cda9509b26f012f93 + 48c32ba53b5c5e132349e49cda9509b26f012f93 Revert "crypto: rng - Override drivers/char/random in FIPS mode" -"https://gitlab.com/cki-project/kernel-ark/-/commit"/dd58ab2a179925e9664a8c3b63a6ad4294c93aee - dd58ab2a179925e9664a8c3b63a6ad4294c93aee ARK: Remove code marking drivers as tech preview +"https://gitlab.com/cki-project/kernel-ark/-/commit"/d7b37d93cc8656073c7fb55544c82eda66564724 + d7b37d93cc8656073c7fb55544c82eda66564724 kabi: Add kABI macros for enum type -"https://gitlab.com/cki-project/kernel-ark/-/commit"/86138a4bbe86f5d31cd73c10b4329e6a53d077de - 86138a4bbe86f5d31cd73c10b4329e6a53d077de ARK: Remove code marking devices deprecated +"https://gitlab.com/cki-project/kernel-ark/-/commit"/e0b6488b6634ae2b9526e73d363ce5830c3e04ae + e0b6488b6634ae2b9526e73d363ce5830c3e04ae kabi: expand and clarify documentation of aux structs -"https://gitlab.com/cki-project/kernel-ark/-/commit"/54565e00efe5a7a58786c2b64d219aa356337822 - 54565e00efe5a7a58786c2b64d219aa356337822 ARK: Remove code marking devices unmaintained +"https://gitlab.com/cki-project/kernel-ark/-/commit"/edf3626d48025612c79cb90b1fa829c422d41b17 + edf3626d48025612c79cb90b1fa829c422d41b17 kabi: introduce RH_KABI_USE_AUX_PTR -"https://gitlab.com/cki-project/kernel-ark/-/commit"/f76083ac89de08c221cd5c3dba643ea077ef7066 - f76083ac89de08c221cd5c3dba643ea077ef7066 rh_message: Fix function name +"https://gitlab.com/cki-project/kernel-ark/-/commit"/507e3c6303bb0039fd2f98c89697b422b2d2e17d + 507e3c6303bb0039fd2f98c89697b422b2d2e17d kabi: rename RH_KABI_SIZE_AND_EXTEND to AUX -"https://gitlab.com/cki-project/kernel-ark/-/commit"/3b3fa5fe15b75d845b67291b5b724c1c612c9f86 - 3b3fa5fe15b75d845b67291b5b724c1c612c9f86 Add Partner Supported taint flag to kAFS +"https://gitlab.com/cki-project/kernel-ark/-/commit"/d162e5ad9b8d9b338f051b31ba2c14c2220ecfa9 + d162e5ad9b8d9b338f051b31ba2c14c2220ecfa9 kabi: more consistent _RH_KABI_SIZE_AND_EXTEND -"https://gitlab.com/cki-project/kernel-ark/-/commit"/29abad9cb138c86a8349944de06ec9e3bfc2325f - 29abad9cb138c86a8349944de06ec9e3bfc2325f Add Partner Supported taint flag +"https://gitlab.com/cki-project/kernel-ark/-/commit"/b74c5a895bd8d61575f25de0591bf5554be8e13a + b74c5a895bd8d61575f25de0591bf5554be8e13a kabi: use fixed field name for extended part -"https://gitlab.com/cki-project/kernel-ark/-/commit"/3367e9b9da550d2bc7c95a81d07315416ad213cf - 3367e9b9da550d2bc7c95a81d07315416ad213cf [redhat] virtio: enable virtio-mem on x86-64 as tech-preview +"https://gitlab.com/cki-project/kernel-ark/-/commit"/ed94348e6e0811c40cd6a6812b86225b17c120d1 + ed94348e6e0811c40cd6a6812b86225b17c120d1 kabi: fix dereference in RH_KABI_CHECK_EXT -"https://gitlab.com/cki-project/kernel-ark/-/commit"/f7f77c1ed5c595ec78798ebac294e8a837b9cd40 - f7f77c1ed5c595ec78798ebac294e8a837b9cd40 kabi: Add kABI macros for enum type +"https://gitlab.com/cki-project/kernel-ark/-/commit"/78a998b6bf5b572be11a593f616b4f1c65bb0ef5 + 78a998b6bf5b572be11a593f616b4f1c65bb0ef5 kabi: fix RH_KABI_SET_SIZE macro -"https://gitlab.com/cki-project/kernel-ark/-/commit"/23d60b0979350152ade54ad7ed158663e5d65f8e - 23d60b0979350152ade54ad7ed158663e5d65f8e kabi: expand and clarify documentation of aux structs +"https://gitlab.com/cki-project/kernel-ark/-/commit"/e39f471dd34a093cec8feb381871d767d3891882 + e39f471dd34a093cec8feb381871d767d3891882 kabi: expand and clarify documentation -"https://gitlab.com/cki-project/kernel-ark/-/commit"/b991137a3216fd0c14eea05bba1e301572be5380 - b991137a3216fd0c14eea05bba1e301572be5380 kabi: introduce RH_KABI_USE_AUX_PTR +"https://gitlab.com/cki-project/kernel-ark/-/commit"/98d524459702e3e4dd68ea3dea71c817b1250b05 + 98d524459702e3e4dd68ea3dea71c817b1250b05 kabi: make RH_KABI_USE replace any number of reserved fields -"https://gitlab.com/cki-project/kernel-ark/-/commit"/4b97338c4f0288a3b48f12bf8c6881dcaf5da715 - 4b97338c4f0288a3b48f12bf8c6881dcaf5da715 kabi: rename RH_KABI_SIZE_AND_EXTEND to AUX +"https://gitlab.com/cki-project/kernel-ark/-/commit"/8eddf541d0e807cd056c0bfa3ca1d678d3ef2905 + 8eddf541d0e807cd056c0bfa3ca1d678d3ef2905 kabi: rename RH_KABI_USE2 to RH_KABI_USE_SPLIT -"https://gitlab.com/cki-project/kernel-ark/-/commit"/39d30d95434167725040e8942f412f7e8ede7762 - 39d30d95434167725040e8942f412f7e8ede7762 kabi: more consistent _RH_KABI_SIZE_AND_EXTEND +"https://gitlab.com/cki-project/kernel-ark/-/commit"/c52082c103063851a243bf37eac75beb3b49a63c + c52082c103063851a243bf37eac75beb3b49a63c kabi: change RH_KABI_REPLACE2 to RH_KABI_REPLACE_SPLIT -"https://gitlab.com/cki-project/kernel-ark/-/commit"/ba33d34381de747c4c225bbc837e957ce20d66b3 - ba33d34381de747c4c225bbc837e957ce20d66b3 kabi: use fixed field name for extended part +"https://gitlab.com/cki-project/kernel-ark/-/commit"/cb1f8a5e4f8a6e7efc8013fbb92e5b5f120ccc70 + cb1f8a5e4f8a6e7efc8013fbb92e5b5f120ccc70 kabi: change RH_KABI_REPLACE_UNSAFE to RH_KABI_BROKEN_REPLACE -"https://gitlab.com/cki-project/kernel-ark/-/commit"/dbd351c645e3e50c291aee846b5062287376b1dc - dbd351c645e3e50c291aee846b5062287376b1dc kabi: fix dereference in RH_KABI_CHECK_EXT +"https://gitlab.com/cki-project/kernel-ark/-/commit"/2949c6be113afd0c0f368f5844c7ab303ded30f3 + 2949c6be113afd0c0f368f5844c7ab303ded30f3 kabi: introduce RH_KABI_ADD_MODIFIER -"https://gitlab.com/cki-project/kernel-ark/-/commit"/559c2729386efbf545749c02f6e11fbd30b607b6 - 559c2729386efbf545749c02f6e11fbd30b607b6 kabi: fix RH_KABI_SET_SIZE macro +"https://gitlab.com/cki-project/kernel-ark/-/commit"/f8c580560a582aeeabbea690e05f8235100c1df7 + f8c580560a582aeeabbea690e05f8235100c1df7 kabi: Include kconfig.h -"https://gitlab.com/cki-project/kernel-ark/-/commit"/adc1d3fe875238b42c7691a18d443af98a667799 - adc1d3fe875238b42c7691a18d443af98a667799 kabi: expand and clarify documentation +"https://gitlab.com/cki-project/kernel-ark/-/commit"/cd6be9087e5a41878eefdd68c859cf12352e06df + cd6be9087e5a41878eefdd68c859cf12352e06df kabi: macros for intentional kABI breakage -"https://gitlab.com/cki-project/kernel-ark/-/commit"/a385ad922a5ef73757e88aae2f6eee728a25790d - a385ad922a5ef73757e88aae2f6eee728a25790d kabi: make RH_KABI_USE replace any number of reserved fields +"https://gitlab.com/cki-project/kernel-ark/-/commit"/061bf7672921a6a1ba52c15427987f2031dd8c18 + 061bf7672921a6a1ba52c15427987f2031dd8c18 kabi: fix the note about terminating semicolon -"https://gitlab.com/cki-project/kernel-ark/-/commit"/d9984c1408008b1f7f07eb8e053ee28479c8a65d - d9984c1408008b1f7f07eb8e053ee28479c8a65d kabi: rename RH_KABI_USE2 to RH_KABI_USE_SPLIT +"https://gitlab.com/cki-project/kernel-ark/-/commit"/2f11c9df2e0e42470a4e3326c0d8c399925fa9ed + 2f11c9df2e0e42470a4e3326c0d8c399925fa9ed kabi: introduce RH_KABI_HIDE_INCLUDE and RH_KABI_FAKE_INCLUDE -"https://gitlab.com/cki-project/kernel-ark/-/commit"/bdfb1172f535d8d16d1992333e8e89e675781e8e - bdfb1172f535d8d16d1992333e8e89e675781e8e kabi: change RH_KABI_REPLACE2 to RH_KABI_REPLACE_SPLIT +"https://gitlab.com/cki-project/kernel-ark/-/commit"/fb2f62b8af9c7d9ac0ba800a7afe8312dede8c50 + fb2f62b8af9c7d9ac0ba800a7afe8312dede8c50 arm64: use common CONFIG_MAX_ZONEORDER for arm kernel -"https://gitlab.com/cki-project/kernel-ark/-/commit"/6b0ccc62c14362bbea4f18d9fef8a8c9bba11b70 - 6b0ccc62c14362bbea4f18d9fef8a8c9bba11b70 kabi: change RH_KABI_REPLACE_UNSAFE to RH_KABI_BROKEN_REPLACE +"https://gitlab.com/cki-project/kernel-ark/-/commit"/a30c7827639f451774f3976c61d00665b771f0ef + a30c7827639f451774f3976c61d00665b771f0ef crypto: rng - Override drivers/char/random in FIPS mode -"https://gitlab.com/cki-project/kernel-ark/-/commit"/02d2820292f46c42c6ad7bd1cf0dbf700e466356 - 02d2820292f46c42c6ad7bd1cf0dbf700e466356 kabi: introduce RH_KABI_ADD_MODIFIER +"https://gitlab.com/cki-project/kernel-ark/-/commit"/c52f8c882b4eb2587871d794b5f7d671b9f4bdb7 + c52f8c882b4eb2587871d794b5f7d671b9f4bdb7 REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70 -"https://gitlab.com/cki-project/kernel-ark/-/commit"/1df1535d462807f2ff1afe7ce03069da88509d0d - 1df1535d462807f2ff1afe7ce03069da88509d0d kabi: Include kconfig.h +"https://gitlab.com/cki-project/kernel-ark/-/commit"/4dd75dfc58322cffc099611109ebb5af6ad9c036 + 4dd75dfc58322cffc099611109ebb5af6ad9c036 KEYS: Make use of platform keyring for module signature verify -"https://gitlab.com/cki-project/kernel-ark/-/commit"/9bc58a344fe3937912fbc1672d90fbf79e2a600a - 9bc58a344fe3937912fbc1672d90fbf79e2a600a kabi: macros for intentional kABI breakage +"https://gitlab.com/cki-project/kernel-ark/-/commit"/2440452a7bec78a9c5dcc8845264b5693ffbfa83 + 2440452a7bec78a9c5dcc8845264b5693ffbfa83 Input: rmi4 - remove the need for artificial IRQ in case of HID -"https://gitlab.com/cki-project/kernel-ark/-/commit"/a3f81948cbcd955ca6c5c70d7204737b432e3d9b - a3f81948cbcd955ca6c5c70d7204737b432e3d9b kabi: fix the note about terminating semicolon +"https://gitlab.com/cki-project/kernel-ark/-/commit"/93a6db4c35f06bf49b9cbc1bb4c5ee1dbd5b4f36 + 93a6db4c35f06bf49b9cbc1bb4c5ee1dbd5b4f36 ARM: tegra: usb no reset -"https://gitlab.com/cki-project/kernel-ark/-/commit"/4b68e3134040aa9944f18093d278d8ce7b9d626f - 4b68e3134040aa9944f18093d278d8ce7b9d626f kabi: introduce RH_KABI_HIDE_INCLUDE and RH_KABI_FAKE_INCLUDE +"https://gitlab.com/cki-project/kernel-ark/-/commit"/38c0280a4f8604770b39acaceae3553e1db7dbc7 + 38c0280a4f8604770b39acaceae3553e1db7dbc7 arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT -"https://gitlab.com/cki-project/kernel-ark/-/commit"/4fdba08b26528ba051695f9d6d6405bb8f309ae7 - 4fdba08b26528ba051695f9d6d6405bb8f309ae7 pci.h: Fix static include +"https://gitlab.com/cki-project/kernel-ark/-/commit"/413a71fe6bfb3539258ca64af8021d687c1386ae + 413a71fe6bfb3539258ca64af8021d687c1386ae redhat: rh_kabi: deduplication friendly structs -"https://gitlab.com/cki-project/kernel-ark/-/commit"/985227d25be6d5fc59c2f76560b502d38e5d2501 - 985227d25be6d5fc59c2f76560b502d38e5d2501 drivers/pci/pci-driver.c: Fix if/ifdef typo +"https://gitlab.com/cki-project/kernel-ark/-/commit"/b5a3a8866b124268bfa1891545bc1326f3ac07b9 + b5a3a8866b124268bfa1891545bc1326f3ac07b9 redhat: rh_kabi add a comment with warning about RH_KABI_EXCLUDE usage -"https://gitlab.com/cki-project/kernel-ark/-/commit"/4e3973a81e742095e60445a02d8c53e2d359ca59 - 4e3973a81e742095e60445a02d8c53e2d359ca59 kernel/rh_taint.c: Update to new messaging +"https://gitlab.com/cki-project/kernel-ark/-/commit"/d8e762ef90e61486c8fd45350f21dd0171beecf0 + d8e762ef90e61486c8fd45350f21dd0171beecf0 redhat: rh_kabi: introduce RH_KABI_EXTEND_WITH_SIZE -"https://gitlab.com/cki-project/kernel-ark/-/commit"/d3214788f4229cf1723e9db397ae87a83a6e43af - d3214788f4229cf1723e9db397ae87a83a6e43af Enable e1000 in rhel9 as unsupported +"https://gitlab.com/cki-project/kernel-ark/-/commit"/ea4c648f75c8c2013fd51834103687ad94be92ba + ea4c648f75c8c2013fd51834103687ad94be92ba redhat: rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve. -"https://gitlab.com/cki-project/kernel-ark/-/commit"/084568d3245eb09ffbd68524790ffaf067fe1f9e - 084568d3245eb09ffbd68524790ffaf067fe1f9e redhat: Add mark_driver_deprecated() +"https://gitlab.com/cki-project/kernel-ark/-/commit"/af0ad59c3e5641859b43214e97aca7ffb512f31f + af0ad59c3e5641859b43214e97aca7ffb512f31f redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference operator -"https://gitlab.com/cki-project/kernel-ark/-/commit"/c6b91e6c523c7a849afb6369556a47595df06b20 - c6b91e6c523c7a849afb6369556a47595df06b20 arm64: use common CONFIG_MAX_ZONEORDER for arm kernel +"https://gitlab.com/cki-project/kernel-ark/-/commit"/d8a372d63e9c30960b88645490071bdec1da7593 + d8a372d63e9c30960b88645490071bdec1da7593 redhat: rh_kabi: Add macros to size and extend structs -"https://gitlab.com/cki-project/kernel-ark/-/commit"/f48225a5975d61faf7e9dca873fd488ce7fb3deb - f48225a5975d61faf7e9dca873fd488ce7fb3deb [fs] dax: mark tech preview +"https://gitlab.com/cki-project/kernel-ark/-/commit"/16732e24c54f8a09d0c3eac37181564f081055c3 + 16732e24c54f8a09d0c3eac37181564f081055c3 Add option of 13 for FORCE_MAX_ZONEORDER -"https://gitlab.com/cki-project/kernel-ark/-/commit"/543678b4f48616c1b7609448bee6ff167c9739c1 - 543678b4f48616c1b7609448bee6ff167c9739c1 [scsi] megaraid_sas: re-add certain pci-ids +"https://gitlab.com/cki-project/kernel-ark/-/commit"/a7bbf8f3448bb83f00e85c759933687064d5c052 + a7bbf8f3448bb83f00e85c759933687064d5c052 s390: Lock down the kernel when the IPL secure flag is set -"https://gitlab.com/cki-project/kernel-ark/-/commit"/390705792b9fd10b7d43511dac1c0d8c9d4204a1 - 390705792b9fd10b7d43511dac1c0d8c9d4204a1 crypto: rng - Override drivers/char/random in FIPS mode +"https://gitlab.com/cki-project/kernel-ark/-/commit"/4856075f195de8ef6e09690ce8bfa650f13edaca + 4856075f195de8ef6e09690ce8bfa650f13edaca efi: Lock down the kernel if booted in secure boot mode -"https://gitlab.com/cki-project/kernel-ark/-/commit"/d898189e71c560aabc07b8c24883d43a752dfc0d - d898189e71c560aabc07b8c24883d43a752dfc0d RHEL: disable io_uring support +"https://gitlab.com/cki-project/kernel-ark/-/commit"/cee6758728de393ec058f7d826156a54ff33df95 + cee6758728de393ec058f7d826156a54ff33df95 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode -"https://gitlab.com/cki-project/kernel-ark/-/commit"/30b6dfb792c4f4665474f284063588c7d33adf3d - 30b6dfb792c4f4665474f284063588c7d33adf3d bpf: Fix unprivileged_bpf_disabled setup +"https://gitlab.com/cki-project/kernel-ark/-/commit"/751d28af34b46d01ba90b7a9a93607011bbc92ff + 751d28af34b46d01ba90b7a9a93607011bbc92ff security: lockdown: expose a hook to lock the kernel down -"https://gitlab.com/cki-project/kernel-ark/-/commit"/da6407998f2715863ddc8714b22ce9cbe63bcd68 - da6407998f2715863ddc8714b22ce9cbe63bcd68 nvme: nvme_mpath_init remove multipath check +"https://gitlab.com/cki-project/kernel-ark/-/commit"/62d8d4ed76b55ac862bc237c597a1a4e2b0da135 + 62d8d4ed76b55ac862bc237c597a1a4e2b0da135 Make get_cert_list() use efi_status_to_str() to print error messages. -"https://gitlab.com/cki-project/kernel-ark/-/commit"/01f03986dedc22078a574d770db7b080541bf40b - 01f03986dedc22078a574d770db7b080541bf40b team: mark team driver as deprecated +"https://gitlab.com/cki-project/kernel-ark/-/commit"/c9704145473f0cd21b222b84a50fbcf002b6e777 + c9704145473f0cd21b222b84a50fbcf002b6e777 Add efi_status_to_str() and rework efi_status_to_err(). -"https://gitlab.com/cki-project/kernel-ark/-/commit"/6c94de9fcbe06bb3ec473649dea8708c2bb7b25c - 6c94de9fcbe06bb3ec473649dea8708c2bb7b25c mm/cma: mark CMA on x86_64 tech preview and print RHEL-specific infos +"https://gitlab.com/cki-project/kernel-ark/-/commit"/cf3ca19669790594c6bfbae6e8a10b3c77434766 + cf3ca19669790594c6bfbae6e8a10b3c77434766 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT -"https://gitlab.com/cki-project/kernel-ark/-/commit"/14c8964fd54903832376f0091928b4f3773a31e9 - 14c8964fd54903832376f0091928b4f3773a31e9 wireguard: disable in FIPS mode +"https://gitlab.com/cki-project/kernel-ark/-/commit"/ce9774693697d5ceed93ee517249e5534873b535 + ce9774693697d5ceed93ee517249e5534873b535 iommu/arm-smmu: workaround DMA mode issues -"https://gitlab.com/cki-project/kernel-ark/-/commit"/6dc9545cd07278244972abc1a0785aedd5b9cf4e - 6dc9545cd07278244972abc1a0785aedd5b9cf4e nvme: decouple basic ANA log page re-read support from native multipathing +"https://gitlab.com/cki-project/kernel-ark/-/commit"/8bdd729938d70d2f719bcbd3d4a38eb5f8a5f7a8 + 8bdd729938d70d2f719bcbd3d4a38eb5f8a5f7a8 rh_kabi: introduce RH_KABI_EXCLUDE -"https://gitlab.com/cki-project/kernel-ark/-/commit"/23b1c65256e371791253e4361dceac7fbd8d2007 - 23b1c65256e371791253e4361dceac7fbd8d2007 nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT +"https://gitlab.com/cki-project/kernel-ark/-/commit"/c5b486c42af476c94118e04becaca2097f4770dd + c5b486c42af476c94118e04becaca2097f4770dd ipmi: do not configure ipmi for HPE m400 -"https://gitlab.com/cki-project/kernel-ark/-/commit"/4f54f5f03133bde10578898db6bc9a11fb432165 - 4f54f5f03133bde10578898db6bc9a11fb432165 nvme: Return BLK_STS_TARGET if the DNR bit is set +"https://gitlab.com/cki-project/kernel-ark/-/commit"/24b9d9d7863fc8768e6e68ba2e8dfe7585deadb3 + 24b9d9d7863fc8768e6e68ba2e8dfe7585deadb3 kABI: Add generic kABI macros to use for kABI workarounds -"https://gitlab.com/cki-project/kernel-ark/-/commit"/993d5fcb23c4e8d08adcaf59af1e50193166ac10 - 993d5fcb23c4e8d08adcaf59af1e50193166ac10 wireguard: mark as Tech Preview +"https://gitlab.com/cki-project/kernel-ark/-/commit"/8ce6cb58e15d6f0ced350225aebe44a18c16f2c2 + 8ce6cb58e15d6f0ced350225aebe44a18c16f2c2 ahci: thunderx2: Fix for errata that affects stop engine -"https://gitlab.com/cki-project/kernel-ark/-/commit"/af9bd32eac2684a381ad090b54ffa656adc7c823 - af9bd32eac2684a381ad090b54ffa656adc7c823 REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70 +"https://gitlab.com/cki-project/kernel-ark/-/commit"/973291fd9e953f741a0d397d31ba7f0ecda959ca + 973291fd9e953f741a0d397d31ba7f0ecda959ca Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon -"https://gitlab.com/cki-project/kernel-ark/-/commit"/88cf526c9cf2ff2c06c0a13b72e5cf9a8883e7ae - 88cf526c9cf2ff2c06c0a13b72e5cf9a8883e7ae redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED +"https://gitlab.com/cki-project/kernel-ark/-/commit"/eb479a048f23c39354382d19216b003333b76a01 + eb479a048f23c39354382d19216b003333b76a01 tags.sh: Ignore redhat/rpm -"https://gitlab.com/cki-project/kernel-ark/-/commit"/b3faa9cfd324e038ae0fa5690bfc78c3a5cfabf7 - b3faa9cfd324e038ae0fa5690bfc78c3a5cfabf7 Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL only +"https://gitlab.com/cki-project/kernel-ark/-/commit"/2c280d59842d68f18e7e726206c911043b80417e + 2c280d59842d68f18e7e726206c911043b80417e aarch64: acpi scan: Fix regression related to X-Gene UARTs -"https://gitlab.com/cki-project/kernel-ark/-/commit"/45ccd6469b7e81f5b1271f1b99ccbf7054a2905a - 45ccd6469b7e81f5b1271f1b99ccbf7054a2905a arch/x86: Remove vendor specific CPU ID checks +"https://gitlab.com/cki-project/kernel-ark/-/commit"/17f75463e4ccb61ea1461f2e730de872bb744bc5 + 17f75463e4ccb61ea1461f2e730de872bb744bc5 ACPI / irq: Workaround firmware issue on X-Gene based m400 -"https://gitlab.com/cki-project/kernel-ark/-/commit"/f2cb32969e301f5c843b9d8c39209a20f35758b3 - f2cb32969e301f5c843b9d8c39209a20f35758b3 redhat: Replace hardware.redhat.com link in Unsupported message +"https://gitlab.com/cki-project/kernel-ark/-/commit"/b94a1bd80d207f87cf3f6b8cf338634e3de5977d + b94a1bd80d207f87cf3f6b8cf338634e3de5977d ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support -"https://gitlab.com/cki-project/kernel-ark/-/commit"/33d14de6464ffdcd1c7515e3f07ecc14d90e410c - 33d14de6464ffdcd1c7515e3f07ecc14d90e410c x86: Fix compile issues with rh_check_supported() +"https://gitlab.com/cki-project/kernel-ark/-/commit"/47345a4e2f847c8b4e29e0714d49fcdb56fe1386 + 47345a4e2f847c8b4e29e0714d49fcdb56fe1386 Pull the RHEL version defines out of the Makefile -"https://gitlab.com/cki-project/kernel-ark/-/commit"/df78c80fe2d8e62f83053453d27fa0309f879480 - df78c80fe2d8e62f83053453d27fa0309f879480 KEYS: Make use of platform keyring for module signature verify - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/67904af7a973c9e4f21babc5dd077c55a68b243a - 67904af7a973c9e4f21babc5dd077c55a68b243a Input: rmi4 - remove the need for artificial IRQ in case of HID - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/3dd36899f2685e082998a4e51df0f3ed457101b7 - 3dd36899f2685e082998a4e51df0f3ed457101b7 ARM: tegra: usb no reset - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/fcf78bd681cc73ce40ee2c89e32b1b4761c1c7d7 - fcf78bd681cc73ce40ee2c89e32b1b4761c1c7d7 arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/9db86311dcb85e3620849ed7fafedbcb6fd8e224 - 9db86311dcb85e3620849ed7fafedbcb6fd8e224 redhat: rh_kabi: deduplication friendly structs - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/a50ddf1fa2704eba55b182acae95e46dfcf5a73d - a50ddf1fa2704eba55b182acae95e46dfcf5a73d redhat: rh_kabi add a comment with warning about RH_KABI_EXCLUDE usage - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/e89d757e4aac9d01c8ee62396840fdca504352f6 - e89d757e4aac9d01c8ee62396840fdca504352f6 redhat: rh_kabi: introduce RH_KABI_EXTEND_WITH_SIZE - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/171c4f04f94e3dbfca50b310b1baed95e06f5748 - 171c4f04f94e3dbfca50b310b1baed95e06f5748 redhat: rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve. - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/769e78a9d79061d3de6e3af8268510377b6df3cb - 769e78a9d79061d3de6e3af8268510377b6df3cb redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference operator - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/8a4eb0f2ab5e7990eb6afb2ef63a9a68f5a06760 - 8a4eb0f2ab5e7990eb6afb2ef63a9a68f5a06760 redhat: rh_kabi: Add macros to size and extend structs - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/a131d4a118083fd9fa1f58d4bc52d9e445d35c7f - a131d4a118083fd9fa1f58d4bc52d9e445d35c7f Removing Obsolete hba pci-ids from rhel8 - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/d38504a2a3641a080da36118a4dba030f5edb132 - d38504a2a3641a080da36118a4dba030f5edb132 mptsas: pci-id table changes - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/8db651d64a3d515753b8da0fec235379bcbdf1de - 8db651d64a3d515753b8da0fec235379bcbdf1de mptsas: Taint kernel if mptsas is loaded - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/62bc01d759e6b6bb8319d25fe5433877ee84ba90 - 62bc01d759e6b6bb8319d25fe5433877ee84ba90 mptspi: pci-id table changes - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/df0d770bdfeef0c92572b152b4b924da2ff77c8d - df0d770bdfeef0c92572b152b4b924da2ff77c8d qla2xxx: Remove PCI IDs of deprecated adapter - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/1f58410fe327714d4fb702cb084246dfb1324e33 - 1f58410fe327714d4fb702cb084246dfb1324e33 be2iscsi: remove unsupported device IDs - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/336b70baa7851801e79da39970721b521dd36965 - 336b70baa7851801e79da39970721b521dd36965 mptspi: Taint kernel if mptspi is loaded - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/adbf0702ff4b067d4ef5e4fc2fdcaaf249e1dcaa - adbf0702ff4b067d4ef5e4fc2fdcaaf249e1dcaa hpsa: remove old cciss-based smartarray pci ids - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/a9bcaf029584c943ed9b0163a5c3dd93bc2c2ff4 - a9bcaf029584c943ed9b0163a5c3dd93bc2c2ff4 qla4xxx: Remove deprecated PCI IDs from RHEL 8 - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/e3664d5684befad59393f717296a8b0c14d93cc9 - e3664d5684befad59393f717296a8b0c14d93cc9 aacraid: Remove depreciated device and vendor PCI id's - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/def673485255bf95500079235a3847423d3abc89 - def673485255bf95500079235a3847423d3abc89 megaraid_sas: remove deprecated pci-ids - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/61fe06cbb6e8adedaec815fa6c069c51258c1010 - 61fe06cbb6e8adedaec815fa6c069c51258c1010 mpt*: remove certain deprecated pci-ids - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/96b984c4b5104f51ce08a28a885adb937c6607c5 - 96b984c4b5104f51ce08a28a885adb937c6607c5 kernel: add SUPPORT_REMOVED kernel taint - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/b75727d351ff2ae0cb927332488fa3481ad0800c - b75727d351ff2ae0cb927332488fa3481ad0800c Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/d44b8e441635e288f4202edea00c481b5d2c9f2b - d44b8e441635e288f4202edea00c481b5d2c9f2b Add option of 13 for FORCE_MAX_ZONEORDER - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/0a60cd77abb72bc0b0037effa275a3c4574f177a - 0a60cd77abb72bc0b0037effa275a3c4574f177a s390: Lock down the kernel when the IPL secure flag is set - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/f71c7cf875fcbb172a1f886b7028edc9de833e32 - f71c7cf875fcbb172a1f886b7028edc9de833e32 efi: Lock down the kernel if booted in secure boot mode - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/1c36d80f13c294582f0ce20888bcd49ec86b1e4e - 1c36d80f13c294582f0ce20888bcd49ec86b1e4e efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/cca2686eaf0e22df287b9322f36f48fadc6ece70 - cca2686eaf0e22df287b9322f36f48fadc6ece70 security: lockdown: expose a hook to lock the kernel down - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/2838c596ac078aeb520b9a4f80e6ec5587726c99 - 2838c596ac078aeb520b9a4f80e6ec5587726c99 Make get_cert_list() use efi_status_to_str() to print error messages. - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/d5e461a2948efb20f8d05157c4cb4767075a148f - d5e461a2948efb20f8d05157c4cb4767075a148f Add efi_status_to_str() and rework efi_status_to_err(). - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/fad40f63ce361436110fee0e09b3cb3490ecab65 - fad40f63ce361436110fee0e09b3cb3490ecab65 Add support for deprecating processors - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/1d5b9da75f2d352b29c22bb41a325f920e42d2c9 - 1d5b9da75f2d352b29c22bb41a325f920e42d2c9 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/a809416d895b6e0923d20dfbd3072300eac89f5a - a809416d895b6e0923d20dfbd3072300eac89f5a iommu/arm-smmu: workaround DMA mode issues - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/42d38bbaae7231c73e53962c8761475ac5b2b5ce - 42d38bbaae7231c73e53962c8761475ac5b2b5ce rh_kabi: introduce RH_KABI_EXCLUDE - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/4afc772846925d7b6110bc41755e74c782f52055 - 4afc772846925d7b6110bc41755e74c782f52055 ipmi: do not configure ipmi for HPE m400 - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/3991531a1136738b8a63ee35df1a884c9788ed3b - 3991531a1136738b8a63ee35df1a884c9788ed3b kABI: Add generic kABI macros to use for kABI workarounds - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/2e2f0eda8ff728376ed0c8291f7412b7714f3fbc - 2e2f0eda8ff728376ed0c8291f7412b7714f3fbc add pci_hw_vendor_status() - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/ebc0e949922fe193c01daabcf1682f39d44584f6 - ebc0e949922fe193c01daabcf1682f39d44584f6 ahci: thunderx2: Fix for errata that affects stop engine - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/97f8cbab67a8c974f60cb0d574b45dd75bb93980 - 97f8cbab67a8c974f60cb0d574b45dd75bb93980 Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/d5f4830ed2345ec6a3abdc380ff1227d5e1b3b19 - d5f4830ed2345ec6a3abdc380ff1227d5e1b3b19 bpf: set unprivileged_bpf_disabled to 1 by default, add a boot parameter - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/340df94e991764987d81624c15e88d355e1e6a0b - 340df94e991764987d81624c15e88d355e1e6a0b add Red Hat-specific taint flags - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/44ba5f4c33a5dce980cf258dbf3ce389606d3721 - 44ba5f4c33a5dce980cf258dbf3ce389606d3721 tags.sh: Ignore redhat/rpm - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/12299ca943276c2db553006394dda108233d2d4c - 12299ca943276c2db553006394dda108233d2d4c put RHEL info into generated headers - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/42f9d8c0a02c591f069b82f4dcb95fc3dbd50186 - 42f9d8c0a02c591f069b82f4dcb95fc3dbd50186 acpi: prefer booting with ACPI over DTS - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/873d2631c79f7f1fba39b1c631908c42c7ddaf78 - 873d2631c79f7f1fba39b1c631908c42c7ddaf78 aarch64: acpi scan: Fix regression related to X-Gene UARTs - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/8612b37f5c3bfb9a07ae0532aa2ca84f3bdecc0b - 8612b37f5c3bfb9a07ae0532aa2ca84f3bdecc0b ACPI / irq: Workaround firmware issue on X-Gene based m400 - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/7d8c03472f3132ce1cde0af750cc016d045c693f - 7d8c03472f3132ce1cde0af750cc016d045c693f modules: add rhelversion MODULE_INFO tag - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/9a01456d0e9eb7201ab04b06bae1d2584e9aa742 - 9a01456d0e9eb7201ab04b06bae1d2584e9aa742 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/837a3323b5559a79042b85d4253fe72166feae47 - 837a3323b5559a79042b85d4253fe72166feae47 Add Red Hat tainting - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/b83287ee634ff355205f179fb9ee9648e968a49a - b83287ee634ff355205f179fb9ee9648e968a49a Introduce CONFIG_RH_DISABLE_DEPRECATED - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/0c43832893d5488f33484396ef14fdcaced9ec7b - 0c43832893d5488f33484396ef14fdcaced9ec7b Pull the RHEL version defines out of the Makefile - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/659a0b456b6e519cc82f35993cf9fd4cd365bc26 - 659a0b456b6e519cc82f35993cf9fd4cd365bc26 [initial commit] Add Red Hat variables in the top level makefile +"https://gitlab.com/cki-project/kernel-ark/-/commit"/edb7af7d82bd1fb742b35370c37d7b29b4850d64 + edb7af7d82bd1fb742b35370c37d7b29b4850d64 [initial commit] Add Red Hat variables in the top level makefile diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 0f979e9f9..afe5f108f 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2056,6 +2056,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set CONFIG_DVB_DM1105=m +# CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m @@ -2072,6 +2073,7 @@ CONFIG_DVB_PLUTO2=m CONFIG_DVB_PT1=m # CONFIG_DVB_PT3 is not set CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_TEST_DRIVERS is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_DVB_ULE_DEBUG is not set @@ -2293,7 +2295,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DA8XX is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set @@ -3303,7 +3305,6 @@ CONFIG_IONIC=m CONFIG_IOSCHED_BFQ=y CONFIG_IOSM=m CONFIG_IO_STRICT_DEVMEM=y -CONFIG_IO_URING=y CONFIG_IP5XXX_POWER=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -4025,7 +4026,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIATEK_GE_PHY=m CONFIG_MEDIATEK_MT6370_ADC=m -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_MEFFICEON is not set CONFIG_MEGARAID_LEGACY=m @@ -6127,7 +6128,6 @@ CONFIG_RESOURCE_KUNIT_TEST=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m -# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RICHTEK_RTQ6056=m CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -8751,6 +8751,7 @@ CONFIG_UTS_NS=y # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_V4L_TEST_DRIVERS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_VCHIQ_CDEV=y CONFIG_VCNL3020=m @@ -8979,6 +8980,13 @@ CONFIG_VIDEO_TW686X=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VISL=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_MAX_DEVS=64 CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIDEO_ZORAN is not set @@ -9006,6 +9014,7 @@ CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_WIFI=m +# CONFIG_VISL_DEBUGFS is not set CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 2aec2a7c0..abf76114d 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2609,7 +2609,6 @@ CONFIG_IOSCHED_BFQ=y # CONFIG_IOSF_MBI_DEBUG is not set CONFIG_IOSM=m # CONFIG_IO_STRICT_DEVMEM is not set -# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m # CONFIG_IP6_NF_IPTABLES is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index abedbd367..297f6909e 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2048,6 +2048,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set CONFIG_DVB_DM1105=m +# CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m @@ -2064,6 +2065,7 @@ CONFIG_DVB_PLUTO2=m CONFIG_DVB_PT1=m # CONFIG_DVB_PT3 is not set CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_TEST_DRIVERS is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_DVB_ULE_DEBUG is not set @@ -2277,7 +2279,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DA8XX is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set @@ -3287,7 +3289,6 @@ CONFIG_IONIC=m CONFIG_IOSCHED_BFQ=y CONFIG_IOSM=m CONFIG_IO_STRICT_DEVMEM=y -CONFIG_IO_URING=y CONFIG_IP5XXX_POWER=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -4005,7 +4006,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIATEK_GE_PHY=m CONFIG_MEDIATEK_MT6370_ADC=m -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_MEFFICEON is not set CONFIG_MEGARAID_LEGACY=m @@ -6106,7 +6107,6 @@ CONFIG_RESOURCE_KUNIT_TEST=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m -# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RICHTEK_RTQ6056=m CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -8728,6 +8728,7 @@ CONFIG_UTS_NS=y # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_V4L_TEST_DRIVERS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_VCHIQ_CDEV=y CONFIG_VCNL3020=m @@ -8956,6 +8957,13 @@ CONFIG_VIDEO_TW686X=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VISL=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_MAX_DEVS=64 CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIDEO_ZORAN is not set @@ -8983,6 +8991,7 @@ CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_WIFI=m +# CONFIG_VISL_DEBUGFS is not set CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index b52ccc240..93be678a5 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2593,7 +2593,6 @@ CONFIG_IOSCHED_BFQ=y # CONFIG_IOSF_MBI_DEBUG is not set CONFIG_IOSM=m # CONFIG_IO_STRICT_DEVMEM is not set -# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m # CONFIG_IP6_NF_IPTABLES is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 0631bf547..c2e7338e5 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2046,6 +2046,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set CONFIG_DVB_DM1105=m +# CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m @@ -2062,6 +2063,7 @@ CONFIG_DVB_PLUTO2=m CONFIG_DVB_PT1=m # CONFIG_DVB_PT3 is not set CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_TEST_DRIVERS is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_DVB_ULE_DEBUG is not set @@ -2293,7 +2295,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DA8XX is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set @@ -3252,7 +3254,6 @@ CONFIG_IONIC=m CONFIG_IOSCHED_BFQ=y CONFIG_IOSM=m CONFIG_IO_STRICT_DEVMEM=y -CONFIG_IO_URING=y # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -3997,7 +3998,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIATEK_GE_PHY=m CONFIG_MEDIATEK_MT6370_ADC=m -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_MEFFICEON is not set CONFIG_MEGARAID_LEGACY=m @@ -6114,7 +6115,6 @@ CONFIG_RESOURCE_KUNIT_TEST=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m -# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RICHTEK_RTQ6056=m CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -8808,6 +8808,7 @@ CONFIG_UTS_NS=y # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_V4L_TEST_DRIVERS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_VCHIQ_CDEV=y CONFIG_VCNL3020=m @@ -9061,6 +9062,13 @@ CONFIG_VIDEO_TW686X=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VISL=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_MAX_DEVS=64 CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIDEO_ZORAN is not set @@ -9088,6 +9096,7 @@ CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_WIFI=m +# CONFIG_VISL_DEBUGFS is not set CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 29aff5d84..c9a5b50fd 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2039,6 +2039,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set CONFIG_DVB_DM1105=m +# CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m @@ -2055,6 +2056,7 @@ CONFIG_DVB_PLUTO2=m CONFIG_DVB_PT1=m # CONFIG_DVB_PT3 is not set CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_TEST_DRIVERS is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_DVB_ULE_DEBUG is not set @@ -2278,7 +2280,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DA8XX is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set @@ -3237,7 +3239,6 @@ CONFIG_IONIC=m CONFIG_IOSCHED_BFQ=y CONFIG_IOSM=m CONFIG_IO_STRICT_DEVMEM=y -CONFIG_IO_URING=y # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -3979,7 +3980,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIATEK_GE_PHY=m CONFIG_MEDIATEK_MT6370_ADC=m -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_MEFFICEON is not set CONFIG_MEGARAID_LEGACY=m @@ -6095,7 +6096,6 @@ CONFIG_RESOURCE_KUNIT_TEST=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m -# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RICHTEK_RTQ6056=m CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -8787,6 +8787,7 @@ CONFIG_UTS_NS=y # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_V4L_TEST_DRIVERS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_VCHIQ_CDEV=y CONFIG_VCNL3020=m @@ -9040,6 +9041,13 @@ CONFIG_VIDEO_TW686X=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VISL=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_MAX_DEVS=64 CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIDEO_ZORAN is not set @@ -9067,6 +9075,7 @@ CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_WIFI=m +# CONFIG_VISL_DEBUGFS is not set CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index b12f1ac35..e12041714 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2003,6 +2003,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set CONFIG_DVB_DM1105=m +# CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m @@ -2019,6 +2020,7 @@ CONFIG_DVB_PLUTO2=m CONFIG_DVB_PT1=m # CONFIG_DVB_PT3 is not set CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_TEST_DRIVERS is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_DVB_ULE_DEBUG is not set @@ -2247,7 +2249,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DA8XX is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set @@ -3188,7 +3190,6 @@ CONFIG_IONIC=m CONFIG_IOSCHED_BFQ=y CONFIG_IOSM=m CONFIG_IO_STRICT_DEVMEM=y -CONFIG_IO_URING=y # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -3919,7 +3920,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIATEK_GE_PHY=m CONFIG_MEDIATEK_MT6370_ADC=m -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_MEFFICEON is not set CONFIG_MEGARAID_LEGACY=m @@ -5946,7 +5947,6 @@ CONFIG_RESOURCE_KUNIT_TEST=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m -# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RICHTEK_RTQ6056=m CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -8569,6 +8569,7 @@ CONFIG_UTS_NS=y # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_V4L_TEST_DRIVERS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_VCHIQ_CDEV=y CONFIG_VCNL3020=m @@ -8810,6 +8811,13 @@ CONFIG_VIDEO_TW686X=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VISL=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_MAX_DEVS=64 CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIDEO_ZORAN is not set @@ -8837,6 +8845,7 @@ CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_WIFI=m +# CONFIG_VISL_DEBUGFS is not set CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index a6ae4713a..8850cd39f 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1996,6 +1996,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set CONFIG_DVB_DM1105=m +# CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m @@ -2012,6 +2013,7 @@ CONFIG_DVB_PLUTO2=m CONFIG_DVB_PT1=m # CONFIG_DVB_PT3 is not set CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_TEST_DRIVERS is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_DVB_ULE_DEBUG is not set @@ -2232,7 +2234,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DA8XX is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set @@ -3173,7 +3175,6 @@ CONFIG_IONIC=m CONFIG_IOSCHED_BFQ=y CONFIG_IOSM=m CONFIG_IO_STRICT_DEVMEM=y -CONFIG_IO_URING=y # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -3901,7 +3902,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIATEK_GE_PHY=m CONFIG_MEDIATEK_MT6370_ADC=m -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_MEFFICEON is not set CONFIG_MEGARAID_LEGACY=m @@ -5927,7 +5928,6 @@ CONFIG_RESOURCE_KUNIT_TEST=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m -# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RICHTEK_RTQ6056=m CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -8548,6 +8548,7 @@ CONFIG_UTS_NS=y # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_V4L_TEST_DRIVERS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_VCHIQ_CDEV=y CONFIG_VCNL3020=m @@ -8789,6 +8790,13 @@ CONFIG_VIDEO_TW686X=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VISL=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_MAX_DEVS=64 CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIDEO_ZORAN is not set @@ -8816,6 +8824,7 @@ CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_WIFI=m +# CONFIG_VISL_DEBUGFS is not set CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index ef9c6daef..e8ddd1062 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1580,6 +1580,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set CONFIG_DVB_DM1105=m +# CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m @@ -1596,6 +1597,7 @@ CONFIG_DVB_PLUTO2=m CONFIG_DVB_PT1=m # CONFIG_DVB_PT3 is not set CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_TEST_DRIVERS is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_DVB_ULE_DEBUG is not set @@ -1792,7 +1794,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DA8XX is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set @@ -2652,7 +2654,6 @@ CONFIG_IONIC=m CONFIG_IOSCHED_BFQ=y CONFIG_IOSM=m CONFIG_IO_STRICT_DEVMEM=y -CONFIG_IO_URING=y # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -3346,7 +3347,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIATEK_GE_PHY=m CONFIG_MEDIATEK_MT6370_ADC=m -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_MEFFICEON is not set CONFIG_MEGARAID_LEGACY=m @@ -5073,7 +5074,6 @@ CONFIG_RESOURCE_KUNIT_TEST=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m -# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RICHTEK_RTQ6056=m CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -7353,6 +7353,7 @@ CONFIG_UTS_NS=y # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_TEST_DRIVERS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_VCHIQ_CDEV=y CONFIG_VCNL3020=m @@ -7539,6 +7540,13 @@ CONFIG_VIDEO_TW686X=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VISL=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_MAX_DEVS=64 CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIDEO_ZORAN is not set @@ -7566,6 +7574,7 @@ CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_WIFI=m +# CONFIG_VISL_DEBUGFS is not set CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 91b4c47bd..56b368b32 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2408,7 +2408,6 @@ CONFIG_IOSCHED_BFQ=y # CONFIG_IOSF_MBI_DEBUG is not set CONFIG_IOSM=m # CONFIG_IO_STRICT_DEVMEM is not set -# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m # CONFIG_IP6_NF_IPTABLES is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index ba5d16ae1..f7abfa2be 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1571,6 +1571,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set CONFIG_DVB_DM1105=m +# CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m @@ -1587,6 +1588,7 @@ CONFIG_DVB_PLUTO2=m CONFIG_DVB_PT1=m # CONFIG_DVB_PT3 is not set CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_TEST_DRIVERS is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_DVB_ULE_DEBUG is not set @@ -1775,7 +1777,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DA8XX is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set @@ -2635,7 +2637,6 @@ CONFIG_IONIC=m CONFIG_IOSCHED_BFQ=y CONFIG_IOSM=m CONFIG_IO_STRICT_DEVMEM=y -CONFIG_IO_URING=y # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -3326,7 +3327,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIATEK_GE_PHY=m CONFIG_MEDIATEK_MT6370_ADC=m -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_MEFFICEON is not set CONFIG_MEGARAID_LEGACY=m @@ -5052,7 +5053,6 @@ CONFIG_RESOURCE_KUNIT_TEST=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m -# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RICHTEK_RTQ6056=m CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -7330,6 +7330,7 @@ CONFIG_UTS_NS=y # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_TEST_DRIVERS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_VCHIQ_CDEV=y CONFIG_VCNL3020=m @@ -7516,6 +7517,13 @@ CONFIG_VIDEO_TW686X=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VISL=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_MAX_DEVS=64 CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIDEO_ZORAN is not set @@ -7543,6 +7551,7 @@ CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_WIFI=m +# CONFIG_VISL_DEBUGFS is not set CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 165de9915..d59a9758a 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2392,7 +2392,6 @@ CONFIG_IOSCHED_BFQ=y # CONFIG_IOSF_MBI_DEBUG is not set CONFIG_IOSM=m # CONFIG_IO_STRICT_DEVMEM is not set -# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m # CONFIG_IP6_NF_IPTABLES is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index cbcce1e11..1d21e60ea 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1585,6 +1585,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set CONFIG_DVB_DM1105=m +# CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m @@ -1601,6 +1602,7 @@ CONFIG_DVB_PLUTO2=m CONFIG_DVB_PT1=m # CONFIG_DVB_PT3 is not set CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_TEST_DRIVERS is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_DVB_ULE_DEBUG is not set @@ -1799,7 +1801,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DA8XX is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set @@ -2629,7 +2631,6 @@ CONFIG_IONIC=m CONFIG_IOSCHED_BFQ=y CONFIG_IOSM=m CONFIG_IO_STRICT_DEVMEM=y -CONFIG_IO_URING=y # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -3327,7 +3328,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y # CONFIG_MEDIA_SUPPORT is not set CONFIG_MEDIATEK_GE_PHY=m CONFIG_MEDIATEK_MT6370_ADC=m -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_MEFFICEON is not set # CONFIG_MEGARAID_LEGACY is not set @@ -5006,7 +5007,6 @@ CONFIG_RESOURCE_KUNIT_TEST=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y # CONFIG_RFKILL is not set -# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RICHTEK_RTQ6056=m CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -7301,6 +7301,7 @@ CONFIG_UTS_NS=y # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_TEST_DRIVERS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_VCHIQ_CDEV=y CONFIG_VCNL3020=m @@ -7490,6 +7491,13 @@ CONFIG_VIDEO_TW686X=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VISL=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_MAX_DEVS=64 CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIDEO_ZORAN is not set @@ -7517,6 +7525,7 @@ CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_WIFI=m +# CONFIG_VISL_DEBUGFS is not set CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 0e9596689..1357df7f0 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2393,7 +2393,6 @@ CONFIG_IOSCHED_BFQ=y # CONFIG_IOSF_MBI_DEBUG is not set CONFIG_IOSM=m # CONFIG_IO_STRICT_DEVMEM is not set -# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m # CONFIG_IP6_NF_IPTABLES is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 87f63cb0e..34fc25fcf 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1576,6 +1576,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set CONFIG_DVB_DM1105=m +# CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m @@ -1592,6 +1593,7 @@ CONFIG_DVB_PLUTO2=m CONFIG_DVB_PT1=m # CONFIG_DVB_PT3 is not set CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_TEST_DRIVERS is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_DVB_ULE_DEBUG is not set @@ -1782,7 +1784,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DA8XX is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set @@ -2612,7 +2614,6 @@ CONFIG_IONIC=m CONFIG_IOSCHED_BFQ=y CONFIG_IOSM=m CONFIG_IO_STRICT_DEVMEM=y -CONFIG_IO_URING=y # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -3307,7 +3308,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y # CONFIG_MEDIA_SUPPORT is not set CONFIG_MEDIATEK_GE_PHY=m CONFIG_MEDIATEK_MT6370_ADC=m -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_MEFFICEON is not set # CONFIG_MEGARAID_LEGACY is not set @@ -4985,7 +4986,6 @@ CONFIG_RESOURCE_KUNIT_TEST=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y # CONFIG_RFKILL is not set -# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RICHTEK_RTQ6056=m CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -7278,6 +7278,7 @@ CONFIG_UTS_NS=y # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_TEST_DRIVERS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_VCHIQ_CDEV=y CONFIG_VCNL3020=m @@ -7467,6 +7468,13 @@ CONFIG_VIDEO_TW686X=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VISL=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_MAX_DEVS=64 CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIDEO_ZORAN is not set @@ -7494,6 +7502,7 @@ CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_WIFI=m +# CONFIG_VISL_DEBUGFS is not set CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 4d4b1b221..464d750db 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2377,7 +2377,6 @@ CONFIG_IOSCHED_BFQ=y # CONFIG_IOSF_MBI_DEBUG is not set CONFIG_IOSM=m # CONFIG_IO_STRICT_DEVMEM is not set -# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m # CONFIG_IP6_NF_IPTABLES is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index b0306c4cb..e29d99df3 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2388,7 +2388,6 @@ CONFIG_IOSCHED_BFQ=y # CONFIG_IOSF_MBI_DEBUG is not set CONFIG_IOSM=m # CONFIG_IO_STRICT_DEVMEM is not set -# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m # CONFIG_IP6_NF_IPTABLES is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 198698a76..08e674875 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1710,6 +1710,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set CONFIG_DVB_DM1105=m +# CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m @@ -1726,6 +1727,7 @@ CONFIG_DVB_PLUTO2=m CONFIG_DVB_PT1=m # CONFIG_DVB_PT3 is not set CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_TEST_DRIVERS is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_DVB_ULE_DEBUG is not set @@ -1961,7 +1963,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DA8XX is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set @@ -2006,7 +2008,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -# CONFIG_FB_VESA is not set +CONFIG_FB_VESA=y # CONFIG_FB_VGA16 is not set # CONFIG_FB_VIA is not set # CONFIG_FB_VIRTUAL is not set @@ -2922,7 +2924,6 @@ CONFIG_IOSCHED_BFQ=y CONFIG_IOSF_MBI=y CONFIG_IOSM=m CONFIG_IO_STRICT_DEVMEM=y -CONFIG_IO_URING=y # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -3626,7 +3627,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIATEK_GE_PHY=m CONFIG_MEDIATEK_MT6370_ADC=m -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_MEFFICEON is not set CONFIG_MEGARAID_LEGACY=m @@ -5419,7 +5420,6 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m -# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RICHTEK_RTQ6056=m CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -7762,6 +7762,7 @@ CONFIG_UV_MMTIMER=m # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_TEST_DRIVERS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m CONFIG_VBOXSF_FS=m @@ -7956,6 +7957,13 @@ CONFIG_VIDEO_TW686X=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VISL=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_MAX_DEVS=64 CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIDEO_ZORAN is not set @@ -7983,6 +7991,7 @@ CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_WIFI=m +# CONFIG_VISL_DEBUGFS is not set CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index bebcc8de0..d862ff44c 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2572,7 +2572,6 @@ CONFIG_IOSCHED_BFQ=y CONFIG_IOSF_MBI=y CONFIG_IOSM=m # CONFIG_IO_STRICT_DEVMEM is not set -# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m # CONFIG_IP6_NF_IPTABLES is not set @@ -7072,7 +7071,7 @@ CONFIG_VIRTIO_FS=m # CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_IOMMU=y -CONFIG_VIRTIO_MEM=m +# CONFIG_VIRTIO_MEM is not set CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set # CONFIG_VIRTIO_MMIO is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 618bfc382..1dc15632f 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1701,6 +1701,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set CONFIG_DVB_DM1105=m +# CONFIG_DVB_DUMMY_FE is not set CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m @@ -1717,6 +1718,7 @@ CONFIG_DVB_PLUTO2=m CONFIG_DVB_PT1=m # CONFIG_DVB_PT3 is not set CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_TEST_DRIVERS is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m # CONFIG_DVB_ULE_DEBUG is not set @@ -1944,7 +1946,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_CIRRUS is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_DA8XX is not set -# CONFIG_FB_EFI is not set +CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_HGA is not set @@ -1989,7 +1991,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -# CONFIG_FB_VESA is not set +CONFIG_FB_VESA=y # CONFIG_FB_VGA16 is not set # CONFIG_FB_VIA is not set # CONFIG_FB_VIRTUAL is not set @@ -2905,7 +2907,6 @@ CONFIG_IOSCHED_BFQ=y CONFIG_IOSF_MBI=y CONFIG_IOSM=m CONFIG_IO_STRICT_DEVMEM=y -CONFIG_IO_URING=y # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -3607,7 +3608,7 @@ CONFIG_MEDIA_SUPPORT_FILTER=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIATEK_GE_PHY=m CONFIG_MEDIATEK_MT6370_ADC=m -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_MEFFICEON is not set CONFIG_MEGARAID_LEGACY=m @@ -5399,7 +5400,6 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m -# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RICHTEK_RTQ6056=m CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -7740,6 +7740,7 @@ CONFIG_UV_MMTIMER=m # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_TEST_DRIVERS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_VBOXGUEST=m CONFIG_VBOXSF_FS=m @@ -7934,6 +7935,13 @@ CONFIG_VIDEO_TW686X=m CONFIG_VIDEO_USBTV=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VISL=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_MAX_DEVS=64 CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_XILINX is not set # CONFIG_VIDEO_ZORAN is not set @@ -7961,6 +7969,7 @@ CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_WIFI=m +# CONFIG_VISL_DEBUGFS is not set CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 9e8af43b6..e710246e5 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2556,7 +2556,6 @@ CONFIG_IOSCHED_BFQ=y CONFIG_IOSF_MBI=y CONFIG_IOSM=m # CONFIG_IO_STRICT_DEVMEM is not set -# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m # CONFIG_IP6_NF_IPTABLES is not set @@ -7048,7 +7047,7 @@ CONFIG_VIRTIO_FS=m # CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_IOMMU=y -CONFIG_VIRTIO_MEM=m +# CONFIG_VIRTIO_MEM is not set CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set # CONFIG_VIRTIO_MMIO is not set diff --git a/kernel.spec b/kernel.spec index 1a3ebbd7d..1f96817e7 100755 --- a/kernel.spec +++ b/kernel.spec @@ -136,7 +136,7 @@ Summary: The Linux kernel # kernel release. (This includes prepatch or "rc" releases.) # Set released_kernel to 0 when the upstream source tarball contains an # unreleased kernel development snapshot. -%global released_kernel 0 +%global released_kernel 1 # Set debugbuildsenabled to 1 to build separate base and debug kernels # (on supported architectures). The kernel-debug-* subpackages will # contain the debug kernel. @@ -145,17 +145,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.0 +%define specversion 6.2.1 %define patchversion 6.2 -%define pkgrelease 63 +%define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2 +%define tarfile_release 6.2.1 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 63%{?buildid}%{?dist} +%define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.0 +%define kabiversion 6.2.1 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3343,6 +3343,18 @@ fi # # %changelog +* Sat Feb 25 2023 Justin M. Forbes [6.2.1-0] +- Add UKI revert patch to allow builds on F36 and F37 (Justin M. Forbes) +- Turn E1000 back on (Justin M. Forbes) +- More files for stable Fedora (Justin M. Forbes) +- Update Makefile.variables for stable releases (Justin M. Forbes) +- drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas) +- enable efifb for Nvidia (Justin M. Forbes) +- Fix up configs for dropped patches (Justin M. Forbes) +- Reset RHEL_RELEASE to 0 for the 6.3 cycle (Justin M. Forbes) +- redhat/configs: Enable CONFIG_V4L_TEST_DRIVERS related drivers (Enric Balletbo i Serra) +- Linux v6.2.1 + * Mon Feb 20 2023 Fedora Kernel Team [6.2.0-63] - Linux v6.2.0 diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 7282a13ed..01cef62b5 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -1,15 +1,10 @@ - Documentation/admin-guide/kernel-parameters.txt | 9 + - Kconfig | 2 + - Kconfig.redhat | 17 + - Makefile | 12 +- + Makefile | 4 + arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 3 +- - arch/arm64/kernel/acpi.c | 4 + arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + - arch/x86/kernel/cpu/common.c | 1 + - arch/x86/kernel/setup.c | 68 ++- + arch/x86/kernel/setup.c | 22 +- drivers/acpi/apei/hest.c | 8 + drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 + @@ -19,108 +14,29 @@ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 +++-- drivers/firmware/efi/secureboot.c | 38 ++ + drivers/firmware/sysfb.c | 18 +- drivers/hid/hid-rmi.c | 66 --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 + drivers/input/rmi4/rmi_driver.c | 124 +++-- drivers/iommu/iommu.c | 22 + - drivers/message/fusion/mptsas.c | 10 + - drivers/message/fusion/mptspi.c | 11 + - drivers/net/wireguard/main.c | 6 + - drivers/nvme/host/core.c | 22 +- - drivers/nvme/host/multipath.c | 19 +- - drivers/nvme/host/nvme.h | 4 + - drivers/pci/pci-driver.c | 78 ++++ drivers/pci/quirks.c | 24 + - drivers/scsi/aacraid/linit.c | 2 + - drivers/scsi/be2iscsi/be_main.c | 2 + - drivers/scsi/hpsa.c | 4 + - drivers/scsi/lpfc/lpfc_ids.h | 12 + - drivers/scsi/megaraid/megaraid_sas_base.c | 4 + - drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 + - drivers/scsi/qla2xxx/qla_os.c | 6 + - drivers/scsi/qla4xxx/ql4_os.c | 2 + drivers/usb/core/hub.c | 7 + - fs/afs/main.c | 3 + include/linux/efi.h | 22 +- - include/linux/kernel.h | 21 + include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hooks.h | 6 + - include/linux/module.h | 1 + - include/linux/panic.h | 18 +- - include/linux/pci.h | 16 + include/linux/rh_kabi.h | 515 +++++++++++++++++++++ include/linux/rmi.h | 1 + include/linux/security.h | 5 + - init/Kconfig | 2 +- - kernel/Makefile | 1 + - kernel/bpf/syscall.c | 23 + - kernel/module/main.c | 2 + kernel/module/signing.c | 9 +- - kernel/panic.c | 13 + - kernel/rh_messages.c | 209 +++++++++ - scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 66 files changed, 1540 insertions(+), 189 deletions(-) + 35 files changed, 980 insertions(+), 177 deletions(-) -diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 6cfa6e3996cf..62b314faa050 100644 ---- a/Documentation/admin-guide/kernel-parameters.txt -+++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6471,6 +6471,15 @@ - unknown_nmi_panic - [X86] Cause panic on unknown NMI. - -+ unprivileged_bpf_disabled= -+ Format: { "0" | "1" | "2" } -+ Sets the initial value of -+ kernel.unprivileged_bpf_disabled sysctl knob. -+ 0 - unprivileged bpf() syscall access is enabled. -+ 1 - unprivileged bpf() syscall access is disabled permanently. -+ 2 - unprivileged bpf() syscall access is disabled. -+ Default value is 2. -+ - usbcore.authorized_default= - [USB] Default USB device authorization: - (default -1 = authorized except for wireless USB, -diff --git a/Kconfig b/Kconfig -index 745bc773f567..f57ff40109d7 100644 ---- a/Kconfig -+++ b/Kconfig -@@ -30,3 +30,5 @@ source "lib/Kconfig" - source "lib/Kconfig.debug" - - source "Documentation/Kconfig" -+ -+source "Kconfig.redhat" -diff --git a/Kconfig.redhat b/Kconfig.redhat -new file mode 100644 -index 000000000000..effb81d04bfd ---- /dev/null -+++ b/Kconfig.redhat -@@ -0,0 +1,17 @@ -+# SPDX-License-Identifier: GPL-2.0-only -+# -+# Red Hat specific options -+# -+ -+menu "Red Hat options" -+ -+config RHEL_DIFFERENCES -+ bool "Remove support for deprecated features" -+ help -+ Red Hat may choose to deprecate certain features in its kernels. -+ Enable this option to remove support for hardware that is no -+ longer supported. -+ -+ Unless you want a restricted kernel, say N here. -+ -+endmenu diff --git a/Makefile b/Makefile -index 3f6628780eb2..0aca431f9bae 100644 +index f26824f367a9..540a8364178e 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -134,21 +50,6 @@ index 3f6628780eb2..0aca431f9bae 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -1346,7 +1350,13 @@ define filechk_version.h - ((c) > 255 ? 255 : (c)))'; \ - echo \#define LINUX_VERSION_MAJOR $(VERSION); \ - echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ -- echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL) -+ echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL); \ -+ echo '#define RHEL_MAJOR $(RHEL_MAJOR)'; \ -+ echo '#define RHEL_MINOR $(RHEL_MINOR)'; \ -+ echo '#define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))'; \ -+ echo '#define RHEL_RELEASE_CODE \ -+ $(shell expr $(RHEL_MAJOR) \* 256 + $(RHEL_MINOR))'; \ -+ echo '#define RHEL_RELEASE "$(RHEL_RELEASE)"' - endef - - $(version_h): PATCHLEVEL := $(or $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 43c7773b89ae..2c1db1cb5528 100644 --- a/arch/arm/Kconfig @@ -186,22 +87,6 @@ index c5ccca26a408..4cacdb4ab764 100644 default "12" if ARM64_16K_PAGES default "11" help -diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c -index 378453faa87e..3eddf2d9ded9 100644 ---- a/arch/arm64/kernel/acpi.c -+++ b/arch/arm64/kernel/acpi.c -@@ -42,7 +42,11 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */ - EXPORT_SYMBOL(acpi_pci_disabled); - - static bool param_acpi_off __initdata; -+#ifdef CONFIG_RHEL_DIFFERENCES -+static bool param_acpi_on __initdata = true; -+#else - static bool param_acpi_on __initdata; -+#endif - static bool param_acpi_force __initdata; - - static int __init parse_acpi(char *arg) diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h index b0d00032479d..afb9544fb007 100644 --- a/arch/s390/include/asm/ipl.h @@ -249,20 +134,8 @@ index 696c9e007a36..80a56c8eaaae 100644 /* Have one command line that is parsed and saved in /proc/cmdline */ /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; -diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index f3cc7699e1e1..78d9e00d3327 100644 ---- a/arch/x86/kernel/cpu/common.c -+++ b/arch/x86/kernel/cpu/common.c -@@ -1570,6 +1570,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) - cpu_detect(c); - get_cpu_vendor(c); - get_cpu_cap(c); -+ get_model_name(c); /* RHEL: get model name for unsupported check */ - get_cpu_address_sizes(c); - setup_force_cpu_cap(X86_FEATURE_CPUID); - cpu_parse_early_param(); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 88188549647c..db4ec95571bb 100644 +index 88188549647c..d4147393237b 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -21,6 +21,7 @@ @@ -273,65 +146,7 @@ index 88188549647c..db4ec95571bb 100644 #include #include #include -@@ -55,6 +56,7 @@ - #include - #include - #include -+#include - - /* - * max_low_pfn_mapped: highest directly mapped pfn < 4 GB -@@ -807,6 +809,49 @@ static void __init early_reserve_memory(void) - trim_snb_memory(); - } - -+#ifdef CONFIG_RHEL_DIFFERENCES -+ -+static void rh_check_supported(void) -+{ -+ bool guest; -+ -+ guest = (x86_hyper_type != X86_HYPER_NATIVE || boot_cpu_has(X86_FEATURE_HYPERVISOR)); -+ -+ /* RHEL supports single cpu on guests only */ -+ if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) && -+ !guest && is_kdump_kernel()) { -+ pr_crit("Detected single cpu native boot.\n"); -+ pr_crit("Important: In this kernel, single threaded, single CPU 64-bit physical systems are unsupported."); -+ } -+ -+ /* -+ * If the RHEL kernel does not support this hardware, the kernel will -+ * attempt to boot, but no support is provided for this hardware -+ */ -+ switch (boot_cpu_data.x86_vendor) { -+ case X86_VENDOR_AMD: -+ case X86_VENDOR_INTEL: -+ break; -+ default: -+ pr_crit("Detected processor %s %s\n", -+ boot_cpu_data.x86_vendor_id, -+ boot_cpu_data.x86_model_id); -+ break; -+ } -+ -+ /* -+ * Due to the complexity of x86 lapic & ioapic enumeration, and PCI IRQ -+ * routing, ACPI is required for x86. acpi=off is a valid debug kernel -+ * parameter, so just print out a loud warning in case something -+ * goes wrong (which is most of the time). -+ */ -+ if (acpi_disabled && !guest) -+ pr_crit("ACPI has been disabled or is not available on this hardware. This may result in a single cpu boot, incorrect PCI IRQ routing, or boot failure.\n"); -+} -+#else -+#define rh_check_supported() -+#endif -+ - /* - * Dump out kernel offset information on panic. - */ -@@ -1038,6 +1083,13 @@ void __init setup_arch(char **cmdline_p) +@@ -1038,6 +1039,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -345,7 +160,7 @@ index 88188549647c..db4ec95571bb 100644 dmi_setup(); /* -@@ -1196,19 +1248,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1196,19 +1204,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -366,15 +181,6 @@ index 88188549647c..db4ec95571bb 100644 reserve_initrd(); -@@ -1321,6 +1361,8 @@ void __init setup_arch(char **cmdline_p) - efi_apply_memmap_quirks(); - #endif - -+ rh_check_supported(); -+ - unwind_init(); - } - diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index 6aef1ee5e1bd..8f146b1b4972 100644 --- a/drivers/acpi/apei/hest.c @@ -748,6 +554,42 @@ index 000000000000..de0a3714a5d4 + } + } +} +diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c +index 3fd3563d962b..75d67e6dde2a 100644 +--- a/drivers/firmware/sysfb.c ++++ b/drivers/firmware/sysfb.c +@@ -34,6 +34,22 @@ + #include + #include + ++static int skip_simpledrm; ++ ++static int __init simpledrm_disable(char *opt) ++{ ++ if (!opt) ++ return -EINVAL; ++ ++ get_option(&opt, &skip_simpledrm); ++ ++ if (skip_simpledrm) ++ pr_info("The simpledrm driver will not be probed\n"); ++ ++ return 0; ++} ++early_param("nvidia-drm.modeset", simpledrm_disable); ++ + static struct platform_device *pd; + static DEFINE_MUTEX(disable_lock); + static bool disabled; +@@ -83,7 +99,7 @@ static __init int sysfb_init(void) + + /* try to create a simple-framebuffer device */ + compatible = sysfb_parse_mode(si, &mode); +- if (compatible) { ++ if (compatible && !skip_simpledrm) { + pd = sysfb_create_simplefb(si, &mode); + if (!IS_ERR(pd)) + goto unlock_mutex; diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 84e7ba5314d3..efc96776f761 100644 --- a/drivers/hid/hid-rmi.c @@ -1133,332 +975,6 @@ index 5f6a85aea501..3b1e9faa9c2d 100644 /* * Changes the default domain of an iommu group that has *only* one device * -diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c -index 88fe4a860ae5..f4b67fe3f000 100644 ---- a/drivers/message/fusion/mptsas.c -+++ b/drivers/message/fusion/mptsas.c -@@ -5320,6 +5320,11 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) - ioc, MPI_SAS_OP_CLEAR_ALL_PERSISTENT); - } - -+#ifdef CONFIG_RHEL_DIFFERENCES -+ add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK); -+ pr_warn("MPTSAS MODULE IS NOT SUPPORTED\n"); -+#endif -+ - error = scsi_add_host(sh, &ioc->pcidev->dev); - if (error) { - dprintk(ioc, printk(MYIOC_s_ERR_FMT -@@ -5383,6 +5388,10 @@ static void mptsas_remove(struct pci_dev *pdev) - } - - static struct pci_device_id mptsas_pci_table[] = { -+#ifdef CONFIG_RHEL_DIFFERENCES -+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068, -+ PCI_VENDOR_ID_VMWARE, PCI_ANY_ID }, -+#else - { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064, - PCI_ANY_ID, PCI_ANY_ID }, - { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068, -@@ -5395,6 +5404,7 @@ static struct pci_device_id mptsas_pci_table[] = { - PCI_ANY_ID, PCI_ANY_ID }, - { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP, - PCI_ANY_ID, PCI_ANY_ID }, -+#endif - {0} /* Terminating entry */ - }; - MODULE_DEVICE_TABLE(pci, mptsas_pci_table); -diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c -index 62089a8caa2f..2606c7cafcf7 100644 ---- a/drivers/message/fusion/mptspi.c -+++ b/drivers/message/fusion/mptspi.c -@@ -1238,12 +1238,17 @@ static struct spi_function_template mptspi_transport_functions = { - */ - - static struct pci_device_id mptspi_pci_table[] = { -+#ifdef CONFIG_RHEL_DIFFERENCES -+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030, -+ PCI_VENDOR_ID_VMWARE, PCI_ANY_ID }, -+#else - { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030, - PCI_ANY_ID, PCI_ANY_ID }, - { PCI_VENDOR_ID_ATTO, MPI_MANUFACTPAGE_DEVID_53C1030, - PCI_ANY_ID, PCI_ANY_ID }, - { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1035, - PCI_ANY_ID, PCI_ANY_ID }, -+#endif - {0} /* Terminating entry */ - }; - MODULE_DEVICE_TABLE(pci, mptspi_pci_table); -@@ -1534,6 +1539,12 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) - 0, 0, 0, 0, 5); - - scsi_scan_host(sh); -+ -+#ifdef CONFIG_RHEL_DIFFERENCES -+ add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK); -+ pr_warn("MPTSPI MODULE IS NOT SUPPORTED\n"); -+#endif -+ - return 0; - - out_mptspi_probe: -diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c -index ee4da9ab8013..d395d11eadc4 100644 ---- a/drivers/net/wireguard/main.c -+++ b/drivers/net/wireguard/main.c -@@ -12,6 +12,7 @@ - - #include - -+#include - #include - #include - #include -@@ -21,6 +22,11 @@ static int __init wg_mod_init(void) - { - int ret; - -+#ifdef CONFIG_RHEL_DIFFERENCES -+ if (fips_enabled) -+ return -EOPNOTSUPP; -+#endif -+ - ret = wg_allowedips_slab_init(); - if (ret < 0) - goto err_allowedips; -diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 8b6421141162..c21b55a5d337 100644 ---- a/drivers/nvme/host/core.c -+++ b/drivers/nvme/host/core.c -@@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) - - static blk_status_t nvme_error_status(u16 status) - { -+ if (unlikely(status & NVME_SC_DNR)) -+ return BLK_STS_TARGET; -+ - switch (status & 0x7ff) { - case NVME_SC_SUCCESS: - return BLK_STS_OK; -@@ -340,6 +343,7 @@ enum nvme_disposition { - COMPLETE, - RETRY, - FAILOVER, -+ FAILUP, - AUTHENTICATE, - }; - -@@ -351,15 +355,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) - if ((nvme_req(req)->status & 0x7ff) == NVME_SC_AUTH_REQUIRED) - return AUTHENTICATE; - -- if (blk_noretry_request(req) || -+ if ((req->cmd_flags & (REQ_FAILFAST_DEV | REQ_FAILFAST_DRIVER)) || - (nvme_req(req)->status & NVME_SC_DNR) || - nvme_req(req)->retries >= nvme_max_retries) - return COMPLETE; - -- if (req->cmd_flags & REQ_NVME_MPATH) { -+ if (req->cmd_flags & (REQ_NVME_MPATH | REQ_FAILFAST_TRANSPORT)) { - if (nvme_is_path_error(nvme_req(req)->status) || - blk_queue_dying(req->q)) -- return FAILOVER; -+ return (req->cmd_flags & REQ_NVME_MPATH) ? -+ FAILOVER : FAILUP; - } else { - if (blk_queue_dying(req->q)) - return COMPLETE; -@@ -389,6 +394,14 @@ static inline void nvme_end_req(struct request *req) - blk_mq_end_request(req, status); - } - -+static inline void nvme_failup_req(struct request *req) -+{ -+ nvme_update_ana(req); -+ -+ nvme_req(req)->status = NVME_SC_HOST_PATH_ERROR; -+ nvme_end_req(req); -+} -+ - void nvme_complete_rq(struct request *req) - { - struct nvme_ctrl *ctrl = nvme_req(req)->ctrl; -@@ -409,6 +422,9 @@ void nvme_complete_rq(struct request *req) - case FAILOVER: - nvme_failover_req(req); - return; -+ case FAILUP: -+ nvme_failup_req(req); -+ return; - case AUTHENTICATE: - #ifdef CONFIG_NVME_AUTH - queue_work(nvme_wq, &ctrl->dhchap_auth_work); -diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index fc39d01e7b63..a3d68d41be11 100644 ---- a/drivers/nvme/host/multipath.c -+++ b/drivers/nvme/host/multipath.c -@@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys) - blk_freeze_queue_start(h->disk->queue); - } - --void nvme_failover_req(struct request *req) -+void nvme_update_ana(struct request *req) - { - struct nvme_ns *ns = req->q->queuedata; - u16 status = nvme_req(req)->status & 0x7ff; -- unsigned long flags; -- struct bio *bio; -- -- nvme_mpath_clear_current_path(ns); - - /* - * If we got back an ANA error, we know the controller is alive but not -@@ -98,6 +94,16 @@ void nvme_failover_req(struct request *req) - set_bit(NVME_NS_ANA_PENDING, &ns->flags); - queue_work(nvme_wq, &ns->ctrl->ana_work); - } -+} -+ -+void nvme_failover_req(struct request *req) -+{ -+ struct nvme_ns *ns = req->q->queuedata; -+ unsigned long flags; -+ struct bio *bio; -+ -+ nvme_mpath_clear_current_path(ns); -+ nvme_update_ana(req); - - spin_lock_irqsave(&ns->head->requeue_lock, flags); - for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -905,8 +911,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) - int error = 0; - - /* check if multipath is enabled and we have the capability */ -- if (!multipath || !ctrl->subsys || -- !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA)) -+ if (!ctrl->subsys || !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA)) - return 0; - - if (!ctrl->max_namespaces || -diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 424c8a467a0c..3230b91d3476 100644 ---- a/drivers/nvme/host/nvme.h -+++ b/drivers/nvme/host/nvme.h -@@ -873,6 +873,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); - void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); - void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys); - void nvme_failover_req(struct request *req); -+void nvme_update_ana(struct request *req); - void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); - int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); - void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid); -@@ -911,6 +912,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) - static inline void nvme_failover_req(struct request *req) - { - } -+static inline void nvme_update_ana(struct request *req) -+{ -+} - static inline void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl) - { - } -diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index a2ceeacc33eb..be6e0feabf99 100644 ---- a/drivers/pci/pci-driver.c -+++ b/drivers/pci/pci-driver.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - #include "pci.h" -@@ -296,6 +297,83 @@ static struct attribute *pci_drv_attrs[] = { - }; - ATTRIBUTE_GROUPS(pci_drv); - -+#ifdef CONFIG_RHEL_DIFFERENCES -+/** -+ * pci_hw_deprecated - Tell if a PCI device is deprecated -+ * @ids: array of PCI device id structures to search in -+ * @dev: the PCI device structure to match against -+ * -+ * Used by a driver to check whether this device is in its list of deprecated -+ * devices. Returns the matching pci_device_id structure or %NULL if there is -+ * no match. -+ * -+ * Reserved for Internal Red Hat use only. -+ */ -+const struct pci_device_id *pci_hw_deprecated(const struct pci_device_id *ids, -+ struct pci_dev *dev) -+{ -+ const struct pci_device_id *ret = pci_match_id(ids, dev); -+ -+ if (!ret) -+ return NULL; -+ -+ mark_hardware_deprecated(dev_driver_string(&dev->dev), "%04X:%04X @ %s", -+ dev->device, dev->vendor, pci_name(dev)); -+ return ret; -+} -+EXPORT_SYMBOL(pci_hw_deprecated); -+ -+/** -+ * pci_hw_unmaintained - Tell if a PCI device is unmaintained -+ * @ids: array of PCI device id structures to search in -+ * @dev: the PCI device structure to match against -+ * -+ * Used by a driver to check whether this device is in its list of unmaintained -+ * devices. Returns the matching pci_device_id structure or %NULL if there is -+ * no match. -+ * -+ * Reserved for Internal Red Hat use only. -+ */ -+const struct pci_device_id *pci_hw_unmaintained(const struct pci_device_id *ids, -+ struct pci_dev *dev) -+{ -+ const struct pci_device_id *ret = pci_match_id(ids, dev); -+ -+ if (!ret) -+ return NULL; -+ -+ mark_hardware_unmaintained(dev_driver_string(&dev->dev), "%04X:%04X @ %s", -+ dev->device, dev->vendor, pci_name(dev)); -+ return ret; -+} -+EXPORT_SYMBOL(pci_hw_unmaintained); -+ -+/** -+ * pci_hw_disabled - Tell if a PCI device is disabled -+ * @ids: array of PCI device id structures to search in -+ * @dev: the PCI device structure to match against -+ * -+ * Used by a driver to check whether this device is in its list of disabled -+ * devices. Returns the matching pci_device_id structure or %NULL if there is -+ * no match. -+ * -+ * Reserved for Internal Red Hat use only. -+ */ -+const struct pci_device_id *pci_hw_disabled(const struct pci_device_id *ids, -+ struct pci_dev *dev) -+{ -+ const struct pci_device_id *ret = pci_match_id(ids, dev); -+ -+ if (!ret) -+ return NULL; -+ -+ mark_hardware_disabled(dev_driver_string(&dev->dev), "%04X:%04X @ %s", -+ dev->device, dev->vendor, pci_name(dev)); -+ return ret; -+} -+EXPORT_SYMBOL(pci_hw_disabled); -+#endif -+ - struct drv_dev_and_id { - struct pci_driver *drv; - struct pci_dev *dev; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 285acc4aaccc..a7056957e7dd 100644 --- a/drivers/pci/quirks.c @@ -1494,260 +1010,6 @@ index 285acc4aaccc..a7056957e7dd 100644 /* * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. -diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c -index 5ba5c18b77b4..87f58b189772 100644 ---- a/drivers/scsi/aacraid/linit.c -+++ b/drivers/scsi/aacraid/linit.c -@@ -78,6 +78,7 @@ char aac_driver_version[] = AAC_DRIVER_FULL_VERSION; - * Note: The last field is used to index into aac_drivers below. - */ - static const struct pci_device_id aac_pci_tbl[] = { -+#ifndef CONFIG_RHEL_DIFFERENCES - { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */ - { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */ - { 0x1028, 0x0003, 0x1028, 0x0003, 0, 0, 2 }, /* PERC 3/Si (SlimFast/PERC3Si */ -@@ -145,6 +146,7 @@ static const struct pci_device_id aac_pci_tbl[] = { - { 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 59 }, /* Adaptec Catch All */ - { 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 60 }, /* Adaptec Rocket Catch All */ - { 0x9005, 0x0288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 61 }, /* Adaptec NEMER/ARK Catch All */ -+#endif - { 0x9005, 0x028b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 62 }, /* Adaptec PMC Series 6 (Tupelo) */ - { 0x9005, 0x028c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 63 }, /* Adaptec PMC Series 7 (Denali) */ - { 0x9005, 0x028d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 64 }, /* Adaptec PMC Series 8 */ -diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c -index 50a577ac3bb4..6f862b855ccf 100644 ---- a/drivers/scsi/be2iscsi/be_main.c -+++ b/drivers/scsi/be2iscsi/be_main.c -@@ -387,11 +387,13 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc) - - /*------------------- PCI Driver operations and data ----------------- */ - static const struct pci_device_id beiscsi_pci_id_table[] = { -+#ifndef CONFIG_RHEL_DIFFERENCES - { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) }, - { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) }, - { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) }, - { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) }, - { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) }, -+#endif - { PCI_DEVICE(ELX_VENDOR_ID, OC_SKH_ID1) }, - { 0 } - }; -diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c -index f6da34850af9..f994f3ce8851 100644 ---- a/drivers/scsi/hpsa.c -+++ b/drivers/scsi/hpsa.c -@@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \ - HPSA_DRIVER_VERSION); - MODULE_VERSION(HPSA_DRIVER_VERSION); - MODULE_LICENSE("GPL"); -+#ifndef CONFIG_RHEL_DIFFERENCES - MODULE_ALIAS("cciss"); -+#endif - - static int hpsa_simple_mode; - module_param(hpsa_simple_mode, int, S_IRUGO|S_IWUSR); -@@ -144,10 +146,12 @@ static const struct pci_device_id hpsa_pci_device_id[] = { - {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x007D}, - {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0088}, - {PCI_VENDOR_ID_HP, 0x333f, 0x103c, 0x333f}, -+#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, - PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0}, - {PCI_VENDOR_ID_COMPAQ, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, - PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0}, -+#endif - {0,} - }; - -diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h -index 0b1616e93cf4..85fc52038a82 100644 ---- a/drivers/scsi/lpfc/lpfc_ids.h -+++ b/drivers/scsi/lpfc/lpfc_ids.h -@@ -24,6 +24,7 @@ - #include - - const struct pci_device_id lpfc_id_table[] = { -+#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY, -@@ -54,10 +55,13 @@ const struct pci_device_id lpfc_id_table[] = { - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP, - PCI_ANY_ID, PCI_ANY_ID, }, -+#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID, - PCI_ANY_ID, PCI_ANY_ID, }, -+#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB, - PCI_ANY_ID, PCI_ANY_ID, }, -+#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP, -@@ -68,6 +72,7 @@ const struct pci_device_id lpfc_id_table[] = { - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB, - PCI_ANY_ID, PCI_ANY_ID, }, -+#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101, -@@ -78,6 +83,7 @@ const struct pci_device_id lpfc_id_table[] = { - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S, - PCI_ANY_ID, PCI_ANY_ID, }, -+#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID, -@@ -90,6 +96,7 @@ const struct pci_device_id lpfc_id_table[] = { - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S, - PCI_ANY_ID, PCI_ANY_ID, }, -+#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF, -@@ -100,18 +107,23 @@ const struct pci_device_id lpfc_id_table[] = { - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TOMCAT, - PCI_ANY_ID, PCI_ANY_ID, }, -+#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON, - PCI_ANY_ID, PCI_ANY_ID, }, -+#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS, - PCI_ANY_ID, PCI_ANY_ID, }, -+#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC, - PCI_ANY_ID, PCI_ANY_ID, }, -+#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC_VF, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE_VF, - PCI_ANY_ID, PCI_ANY_ID, }, -+#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G6_FC, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC, -diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c -index 3ceece988338..9ac2cfc37f71 100644 ---- a/drivers/scsi/megaraid/megaraid_sas_base.c -+++ b/drivers/scsi/megaraid/megaraid_sas_base.c -@@ -149,6 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance); - */ - static struct pci_device_id megasas_pci_table[] = { - -+#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)}, - /* xscale IOP */ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)}, -@@ -157,16 +158,19 @@ static struct pci_device_id megasas_pci_table[] = { - /* ppc IOP */ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078GEN2)}, - /* gen2*/ -+#endif - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0079GEN2)}, - /* gen2*/ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0073SKINNY)}, - /* skinny*/ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0071SKINNY)}, - /* skinny*/ -+#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)}, - /* xscale IOP, vega */ - {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)}, - /* xscale IOP */ -+#endif - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FUSION)}, - /* Fusion */ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)}, -diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -index 8e24ebcebfe5..25aa49292397 100644 ---- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c -+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -@@ -12618,6 +12618,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) - * The pci device ids are defined in mpi/mpi2_cnfg.h. - */ - static const struct pci_device_id mpt3sas_pci_table[] = { -+#ifndef CONFIG_RHEL_DIFFERENCES - /* Spitfire ~ 2004 */ - { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004, - PCI_ANY_ID, PCI_ANY_ID }, -@@ -12636,6 +12637,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { - PCI_ANY_ID, PCI_ANY_ID }, - { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2, - PCI_ANY_ID, PCI_ANY_ID }, -+#endif - /* Thunderbolt ~ 2208 */ - { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1, - PCI_ANY_ID, PCI_ANY_ID }, -@@ -12660,9 +12662,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = { - PCI_ANY_ID, PCI_ANY_ID }, - { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1, - PCI_ANY_ID, PCI_ANY_ID }, -+#ifndef CONFIG_RHEL_DIFFERENCES - /* SSS6200 */ - { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SSS6200, - PCI_ANY_ID, PCI_ANY_ID }, -+#endif - /* Fury ~ 3004 and 3008 */ - { MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004, - PCI_ANY_ID, PCI_ANY_ID }, -diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index 7fb28c207ee5..54f5e412e732 100644 ---- a/drivers/scsi/qla2xxx/qla_os.c -+++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -8065,6 +8065,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { - }; - - static struct pci_device_id qla2xxx_pci_tbl[] = { -+#ifndef CONFIG_RHEL_DIFFERENCES - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, -@@ -8077,13 +8078,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) }, -+#endif - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) }, -+#ifndef CONFIG_RHEL_DIFFERENCES - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8001) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8021) }, -+#endif - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8031) }, -+#ifndef CONFIG_RHEL_DIFFERENCES - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISPF001) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) }, -+#endif - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2071) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) }, - { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) }, -diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c -index 005502125b27..cd577c40dcca 100644 ---- a/drivers/scsi/qla4xxx/ql4_os.c -+++ b/drivers/scsi/qla4xxx/ql4_os.c -@@ -9854,6 +9854,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = { - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - }, -+#ifndef CONFIG_RHEL_DIFFERENCES - { - .vendor = PCI_VENDOR_ID_QLOGIC, - .device = PCI_DEVICE_ID_QLOGIC_ISP8022, -@@ -9872,6 +9873,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = { - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - }, -+#endif - {0, 0}, - }; - MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 9eca403af2a8..ebe803d4ad4d 100644 --- a/drivers/usb/core/hub.c @@ -1766,20 +1028,6 @@ index 9eca403af2a8..ebe803d4ad4d 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); -diff --git a/fs/afs/main.c b/fs/afs/main.c -index eae288c8d40a..8b8bf447cedc 100644 ---- a/fs/afs/main.c -+++ b/fs/afs/main.c -@@ -201,6 +201,9 @@ static int __init afs_init(void) - goto error_proc; - } - -+#ifdef CONFIG_RHEL_DIFFERENCES -+ mark_partner_supported(KBUILD_MODNAME, THIS_MODULE); -+#endif - return ret; - - error_proc: diff --git a/include/linux/efi.h b/include/linux/efi.h index 98598bd1d2fa..34a6233fabaf 100644 --- a/include/linux/efi.h @@ -1848,36 +1096,6 @@ index 98598bd1d2fa..34a6233fabaf 100644 static inline 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 fe6efb24d151..85b185391da7 100644 ---- a/include/linux/kernel.h -+++ b/include/linux/kernel.h -@@ -508,4 +508,25 @@ 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)) -+ -+struct module; -+ -+#ifdef CONFIG_RHEL_DIFFERENCES -+void mark_hardware_unmaintained(const char *driver_name, char *fmt, ...); -+void mark_driver_unmaintained(const char *driver_name); -+void mark_hardware_deprecated(const char *driver_name, char *fmt, ...); -+void mark_driver_deprecated(const char *driver_name); -+void mark_hardware_disabled(const char *driver_name, char *fmt, ...); -+void mark_tech_preview(const char *msg, struct module *mod); -+void mark_partner_supported(const char *msg, struct module *mod); -+#else -+static inline void mark_hardware_unmaintained(const char *driver_name, char *fmt, ...) { } -+static inline void mark_driver_unmaintained(const char *driver_name) { } -+static inline void mark_hardware_deprecated(const char *driver_name, char *fmt, ...) { } -+static inline void mark_driver_deprecated(const char *driver_name) { } -+static inline void mark_hardware_disabled(const char *driver_name, char *fmt, ...) { } -+static inline void mark_tech_preview(const char *msg, struct module *mod) { } -+static inline void mark_partner_supported(const char *msg, struct module *mod) { } -+#endif -+ - #endif diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h index ed6cb2ac55fa..72fb26d13f28 100644 --- a/include/linux/lsm_hook_defs.h @@ -1908,74 +1126,6 @@ index 0a5ba81f7367..39826de8d680 100644 * Security hooks for perf events * * @perf_event_open: -diff --git a/include/linux/module.h b/include/linux/module.h -index 8c5909c0076c..bab37e9055b1 100644 ---- a/include/linux/module.h -+++ b/include/linux/module.h -@@ -379,6 +379,7 @@ struct module { - struct module_attribute *modinfo_attrs; - const char *version; - const char *srcversion; -+ const char *rhelversion; - struct kobject *holders_dir; - - /* Exported symbols */ -diff --git a/include/linux/panic.h b/include/linux/panic.h -index 979b776e3bcb..4eabcc0d8a91 100644 ---- a/include/linux/panic.h -+++ b/include/linux/panic.h -@@ -70,7 +70,23 @@ static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout) - #define TAINT_AUX 16 - #define TAINT_RANDSTRUCT 17 - #define TAINT_TEST 18 --#define TAINT_FLAGS_COUNT 19 -+/* Start of Red Hat-specific taint flags */ -+#define TAINT_19 19 -+#define TAINT_20 20 -+#define TAINT_21 21 -+#define TAINT_22 22 -+#define TAINT_23 23 -+#define TAINT_24 24 -+#define TAINT_25 25 -+#define TAINT_PARTNER_SUPPORTED 26 -+#define TAINT_SUPPORT_REMOVED 27 -+/* Bits 28 - 31 are reserved for Red Hat use only */ -+#define TAINT_RESERVED28 28 -+#define TAINT_RESERVED29 29 -+#define TAINT_RESERVED30 30 -+#define TAINT_UNPRIVILEGED_BPF 31 -+/* End of Red Hat-specific taint flags */ -+#define TAINT_FLAGS_COUNT 32 - #define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1) - - struct taint_flag { -diff --git a/include/linux/pci.h b/include/linux/pci.h -index 254c8a4126a8..c0f718911aa9 100644 ---- a/include/linux/pci.h -+++ b/include/linux/pci.h -@@ -1520,6 +1520,22 @@ 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); -+ -+#ifdef CONFIG_RHEL_DIFFERENCES -+const struct pci_device_id *pci_hw_deprecated(const struct pci_device_id *ids, -+ struct pci_dev *dev); -+const struct pci_device_id *pci_hw_unmaintained(const struct pci_device_id *ids, -+ struct pci_dev *dev); -+const struct pci_device_id *pci_hw_disabled(const struct pci_device_id *ids, -+ struct pci_dev *dev); -+#else -+static inline const struct pci_device_id *pci_hw_deprecated(const struct pci_device_id *ids, -+ struct pci_dev *dev) { return NULL; } -+static inline const struct pci_device_id *pci_hw_unmaintained(const struct pci_device_id *ids, -+ struct pci_dev *dev) { return NULL; } -+static inline const struct pci_device_id *pci_hw_disabled(const struct pci_device_id *ids, -+ struct pci_dev *dev) {return NULL; } -+#endif - int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, - int pass); - diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h new file mode 100644 index 000000000000..c7b42c1f1681 @@ -2532,99 +1682,6 @@ index 5b67f208f7de..060133d19a4b 100644 #endif /* CONFIG_SECURITY */ #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) -diff --git a/init/Kconfig b/init/Kconfig -index 44e90b28a30f..2d854d4f390a 100644 ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -1698,7 +1698,7 @@ config AIO - this option saves about 7k. - - config IO_URING -- bool "Enable IO uring support" if EXPERT -+ bool "Enable IO uring support" - select IO_WQ - default y - help -diff --git a/kernel/Makefile b/kernel/Makefile -index 10ef068f598d..d7953f0ee28a 100644 ---- a/kernel/Makefile -+++ b/kernel/Makefile -@@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \ - notifier.o ksysfs.o cred.o reboot.o \ - async.o range.o smpboot.o ucount.o regset.o - -+obj-$(CONFIG_RHEL_DIFFERENCES) += rh_messages.o - obj-$(CONFIG_USERMODE_DRIVER) += usermode_driver.o - obj-$(CONFIG_MODULES) += kmod.o - obj-$(CONFIG_MULTIUSER) += groups.o -diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index ecca9366c7a6..be37bb092f7a 100644 ---- a/kernel/bpf/syscall.c -+++ b/kernel/bpf/syscall.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -54,6 +55,23 @@ static DEFINE_SPINLOCK(map_idr_lock); - static DEFINE_IDR(link_idr); - static DEFINE_SPINLOCK(link_idr_lock); - -+static int __init unprivileged_bpf_setup(char *str) -+{ -+ unsigned long disabled; -+ if (!kstrtoul(str, 0, &disabled)) -+ sysctl_unprivileged_bpf_disabled = !!disabled; -+ -+ if (!sysctl_unprivileged_bpf_disabled) { -+ pr_warn("Unprivileged BPF has been enabled " -+ "(unprivileged_bpf_disabled=0 has been supplied " -+ "in boot parameters), tainting the kernel"); -+ add_taint(TAINT_UNPRIVILEGED_BPF, LOCKDEP_STILL_OK); -+ } -+ -+ return 1; -+} -+__setup("unprivileged_bpf_disabled=", unprivileged_bpf_setup); -+ - int sysctl_unprivileged_bpf_disabled __read_mostly = - IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0; - -@@ -5288,6 +5306,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, - if (write && !ret) { - if (locked_state && unpriv_enable != 1) - return -EPERM; -+ if (!unpriv_enable) { -+ pr_warn("Unprivileged BPF has been enabled, " -+ "tainting the kernel"); -+ add_taint(TAINT_UNPRIVILEGED_BPF, LOCKDEP_STILL_OK); -+ } - *(int *)table->data = unpriv_enable; - } - -diff --git a/kernel/module/main.c b/kernel/module/main.c -index 4ac3fe43e6c8..5b2604d7e2a7 100644 ---- a/kernel/module/main.c -+++ b/kernel/module/main.c -@@ -521,6 +521,7 @@ static struct module_attribute modinfo_##field = { \ - - MODINFO_ATTR(version); - MODINFO_ATTR(srcversion); -+MODINFO_ATTR(rhelversion); - - static struct { - char name[MODULE_NAME_LEN + 1]; -@@ -968,6 +969,7 @@ struct module_attribute *modinfo_attrs[] = { - &module_uevent, - &modinfo_version, - &modinfo_srcversion, -+ &modinfo_rhelversion, - &modinfo_initstate, - &modinfo_coresize, - #ifdef CONFIG_ARCH_WANTS_MODULES_DATA_IN_VMALLOC diff --git a/kernel/module/signing.c b/kernel/module/signing.c index a2ff4242e623..f0d2be1ee4f1 100644 --- a/kernel/module/signing.c @@ -2648,278 +1705,6 @@ index a2ff4242e623..f0d2be1ee4f1 100644 } int module_sig_check(struct load_info *info, int flags) -diff --git a/kernel/panic.c b/kernel/panic.c -index 463c9295bc28..9f4d0cefeceb 100644 ---- a/kernel/panic.c -+++ b/kernel/panic.c -@@ -470,6 +470,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { - [ TAINT_AUX ] = { 'X', ' ', true }, - [ TAINT_RANDSTRUCT ] = { 'T', ' ', true }, - [ TAINT_TEST ] = { 'N', ' ', true }, -+ [ TAINT_19 ] = { '?', '-', false }, -+ [ TAINT_20 ] = { '?', '-', false }, -+ [ TAINT_21 ] = { '?', '-', false }, -+ [ TAINT_22 ] = { '?', '-', false }, -+ [ TAINT_23 ] = { '?', '-', false }, -+ [ TAINT_24 ] = { '?', '-', false }, -+ [ TAINT_25 ] = { '?', '-', false }, -+ [ TAINT_PARTNER_SUPPORTED ] = { 'p', ' ', true }, -+ [ TAINT_SUPPORT_REMOVED ] = { 'h', ' ', false }, -+ [ TAINT_RESERVED28 ] = { '?', '-', false }, -+ [ TAINT_RESERVED29 ] = { '?', '-', false }, -+ [ TAINT_RESERVED30 ] = { '?', '-', false }, -+ [ TAINT_UNPRIVILEGED_BPF ] = { 'u', ' ', false }, - }; - - /** -diff --git a/kernel/rh_messages.c b/kernel/rh_messages.c -new file mode 100644 -index 000000000000..c55fb108c6bb ---- /dev/null -+++ b/kernel/rh_messages.c -@@ -0,0 +1,209 @@ -+#include -+#include -+ -+#define DEV_DESC_LEN 256 -+/* -+ * The following functions are used by Red Hat to indicate to users that -+ * hardware and drivers are unsupported, or have limited support in RHEL major -+ * and minor releases. These functions output loud warning messages to the end -+ * user and should be USED WITH CAUTION. -+ * -+ * Any use of these functions _MUST_ be documented in the RHEL Release Notes, -+ * and have approval of management. -+ * -+ * Generally, the process of disabling a driver or device in RHEL requires the -+ * driver or device to be marked as 'deprecated' in all existing releases, and -+ * then either 'unmaintained' or 'disabled' in a future release. -+ * -+ * In general, deprecated and unmaintained drivers continue to receive security -+ * related fixes until they are disabled. -+ */ -+ -+/** -+ * mark_hardware_unmaintained() - Mark hardware as unmaintained. -+ * @driver_name: driver name -+ * @fmt: format for device description -+ * @...: args for device description -+ * -+ * Called to notify users that the device will no longer be tested on a routine -+ * basis and driver code associated with this device is no longer being updated. -+ * Red Hat may fix security-related and critical issues. Support for this device -+ * will be disabled in a future major release and users deploying this device -+ * should plan to replace the device in production systems. -+ * -+ * This function should be used when the driver's usage can be tied to a -+ * specific hardware device. For example, a network device driver loading on a -+ * specific device that is no longer maintained by the manufacturer. -+ */ -+void mark_hardware_unmaintained(const char *driver_name, char *fmt, ...) -+{ -+ char device_description[DEV_DESC_LEN]; -+ va_list args; -+ -+ va_start(args, fmt); -+ vsnprintf(device_description, DEV_DESC_LEN, fmt, args); -+ pr_crit("Warning: Unmaintained hardware is detected: %s:%s\n", driver_name, -+ device_description); -+ va_end(args); -+} -+EXPORT_SYMBOL(mark_hardware_unmaintained); -+ -+/** -+ * mark_driver_unmaintained() - Mark a driver as unmaintained. -+ * @driver_name: driver name -+ * -+ * Called to notify users that a driver will no longer be tested on a routine -+ * basis and the driver code is no longer being updated. Red Hat may fix -+ * security-related and critical issues. Support for this driver will be -+ * disabled in a future major release, and users should replace any affected -+ * devices in production systems. -+ * -+ * This function should be used when a driver's usage cannot be tied to a -+ * specific hardware device. For example, a network bonding driver or a higher -+ * level storage layer driver that is no longer maintained upstream. -+ */ -+void mark_driver_unmaintained(const char *driver_name) -+{ -+ pr_crit("Warning: Unmaintained driver is detected: %s\n", driver_name); -+} -+EXPORT_SYMBOL(mark_driver_unmaintained); -+ -+/** -+ * mark_hardware_deprecated() - Mark hardware as deprecated. -+ * @driver_name: driver name -+ * @fmt: format for device description -+ * @...: args for device description -+ * -+ * Called to notify users that support for the device is planned to be -+ * unmaintained in a future major release, and will eventually be disabled in a -+ * future major release. This device should not be used in new production -+ * environments and users should replace the device in production systems. -+ * -+ * This function should be used when the driver's usage can be tied to a -+ * specific hardware device. For example, a network device driver loading on a -+ * specific device that is no longer maintained by the manufacturer. -+ */ -+void mark_hardware_deprecated(const char *driver_name, char *fmt, ...) -+{ -+ char device_description[DEV_DESC_LEN]; -+ va_list args; -+ -+ va_start(args, fmt); -+ vsnprintf(device_description, DEV_DESC_LEN, fmt, args); -+ pr_crit("Warning: Deprecated Hardware is detected: %s:%s will not be maintained in a future major release and may be disabled\n", -+ driver_name, device_description); -+ va_end(args); -+} -+EXPORT_SYMBOL(mark_hardware_deprecated); -+ -+/** -+ * mark_driver_deprecated() - Mark a driver as deprecated. -+ * @driver_name: driver name -+ * -+ * Called to notify users that support for this driver is planned to be -+ * unmaintained in a future major release, and will eventually be disabled in a -+ * future major release. This driver should not be used in new production -+ * environments and users should replace any affected devices in production -+ * systems. -+ * -+ * This function should be used when a driver's usage cannot be tied to a -+ * specific hardware device. For example, a network bonding driver or a higher -+ * level storage layer driver that is no longer maintained upstream. -+ */ -+void mark_driver_deprecated(const char *driver_name) -+{ -+ pr_crit("Warning: Deprecated Driver is detected: %s will not be maintained in a future major release and may be disabled\n", -+ driver_name); -+} -+EXPORT_SYMBOL(mark_driver_deprecated); -+ -+/** -+ * mark_hardware_disabled() - Mark a driver as removed. -+ * @driver_name: driver name -+ * @fmt: format for device description -+ * @...: args for device description -+ * -+ * Called to notify users that a device's support has been completely disabled -+ * and no future support updates will occur. This device cannot be used in new -+ * production environments, and users must replace the device in production -+ * systems. -+ * -+ * This function should be used when the driver's usage can be tied to a -+ * specific hardware device. For example, a network device driver loading on a -+ * specific device that is no longer maintained by the manufacturer. -+ */ -+void mark_hardware_disabled(const char *driver_name, char *fmt, ...) -+{ -+ char device_description[DEV_DESC_LEN]; -+ va_list args; -+ -+ va_start(args, fmt); -+ vsnprintf(device_description, DEV_DESC_LEN, fmt, args); -+ pr_crit("Warning: Disabled Hardware is detected: %s:%s is no longer enabled in this release.\n", -+ driver_name, device_description); -+ va_end(args); -+} -+EXPORT_SYMBOL(mark_hardware_disabled); -+ -+/** -+ * mark_tech_preview() - Mark driver or kernel subsystem as 'Tech Preview' -+ * @msg: Driver or kernel subsystem name -+ * -+ * Called to minimize the support status of a new driver. This does TAINT the -+ * kernel. Calling this function indicates that the driver or subsystem has -+ * had limited testing and is not marked for full support within this RHEL -+ * minor release. The next RHEL minor release may contain full support for -+ * this driver. Red Hat does not guarantee that bugs reported against this -+ * driver or subsystem will be resolved. -+ */ -+void mark_tech_preview(const char *msg, struct module *mod) -+{ -+ const char *str = NULL; -+ -+ if (msg) -+ str = msg; -+#ifdef CONFIG_MODULES -+ else if (mod) -+ str = mod->name; -+#endif -+ -+ pr_warn("TECH PREVIEW: %s may not be fully supported.\n" -+ "Please review provided documentation for limitations.\n", -+ (str ? str : "kernel")); -+ add_taint(TAINT_AUX, LOCKDEP_STILL_OK); -+#ifdef CONFIG_MODULES -+ if (mod) -+ mod->taints |= (1U << TAINT_AUX); -+#endif -+} -+EXPORT_SYMBOL(mark_tech_preview); -+ -+/** -+ * mark_partner_supported() - Mark driver or kernel subsystem as 'Partner Supported' -+ * @msg: Driver or kernel subsystem name -+ * -+ * Called to clarify the support status of a driver. This does TAINT the -+ * kernel. Calling this function indicates that the driver or subsystem is -+ * supported by one of our partners and not by Red Hat directly. -+ */ -+void mark_partner_supported(const char *msg, struct module *mod) -+{ -+ const char *str = NULL; -+ -+ if (msg) -+ str = msg; -+#ifdef CONFIG_MODULES -+ else if (mod && mod->name) -+ str = mod->name; -+#endif -+ -+ pr_warn("Notice: %s is a Partner Supported GPL module and not supported directly by Red Hat.\n" -+ "Please contact your provider for support.\n", -+ (str ? str : "kernel")); -+ add_taint(TAINT_PARTNER_SUPPORTED, LOCKDEP_STILL_OK); -+#ifdef CONFIG_MODULES -+ if (mod) -+ mod->taints |= (1U << TAINT_PARTNER_SUPPORTED); -+#endif -+} -+EXPORT_SYMBOL(mark_partner_supported); -diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index efff8078e395..1b4f8306cea6 100644 ---- a/scripts/mod/modpost.c -+++ b/scripts/mod/modpost.c -@@ -22,6 +22,7 @@ - #include - #include "modpost.h" - #include "../../include/linux/license.h" -+#include "../../include/generated/uapi/linux/version.h" - - /* Are we using CONFIG_MODVERSIONS? */ - static bool modversions; -@@ -2138,6 +2139,12 @@ static void write_buf(struct buffer *b, const char *fname) - } - } - -+static void add_rhelversion(struct buffer *b, struct module *mod) -+{ -+ buf_printf(b, "MODULE_INFO(rhelversion, \"%d.%d\");\n", RHEL_MAJOR, -+ RHEL_MINOR); -+} -+ - static void write_if_changed(struct buffer *b, const char *fname) - { - char *tmp; -@@ -2201,6 +2208,7 @@ static void write_mod_c_file(struct module *mod) - add_depends(&buf, mod); - add_moddevtable(&buf, mod); - add_srcversion(&buf, mod); -+ add_rhelversion(&buf, mod); - - ret = snprintf(fname, sizeof(fname), "%s.mod.c", mod->name); - if (ret >= sizeof(fname)) { diff --git a/scripts/tags.sh b/scripts/tags.sh index e137cf15aae9..2ed2341f7967 100755 --- a/scripts/tags.sh diff --git a/redhatsecureboot003.cer b/redhatsecureboot003.cer deleted file mode 100644 index 439b75bf3ae770d62b82116e68f58758e21f2444..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 829 zcmXqLVzxABVp3ed%*4pV#K~~)o6?a_AKRD=c-c6$+C196^D;7WvoaWH8EP1)u`!3T zFbm5ErKTu&B$g-yrzV#cr7Ae(=a(orJ1Q6{Xe6bUBx)MSiSrto7#bKG8k!hd8W~54 z^BS8Q8W@>Exd!@%x(3=1vsAE|6`Yx#mzkHYU<@;`iBSpJJ&ddj%uS5^38Id!^c(kLT-{T5|9AJiUptUCmFl{(tOP z@bBt-z9uD(?ba@KccSZe?SB?AmnpAwf54mb_Dd&nJ&M#h{G65f#ix8NmW)}3M*S?N zXXQ=K_*X{F?429)m5G^=fpKxHL9_u68*`|vFeBrC7A6A*18xwHpM`~)iM_!<7R2FW z5n~ZaJ-YAIv&gK!IfX}-&p4*qTb<5&!9X4)t;`}}Al4w#_~V^>jNRMc=a#nYyT0!B z<=T|ZTF4Q=4UPathBP@_*A*R?U6;C*HNni_@)7=gwp1-;-H9|H@MS{2!}*%`QH85Ub!k;Ye!Y zcHYV?_4gTwul)^n@#X7-1 zdA-S3L_?4Hlzfd}uv15OR#ki6hd9-@e{LKxF*aJuc*WZ@@DO|bgxptOeH;r@UdwAP bmQPtE$Ctk_eP-_rnH|A%4P@6Dg5=#_OQj1C) zic(WD5=-=w^K%X4#CZ)(3=Iv;4Gj!U4NRlNd5z5t4GlmD#5D*q)G^S4Sf`BDy5h|A zyv)3GQtWJER6_O@BP#=Q6C*!^K@%evQxhX2!zT5vqmx`?o`(oz{$eeCezR_cLPyl% zHpefqUbuO&%O^nA}y6#9BjM%~U7Q(5kw6_YN1epR)|xb9Elg4_B`%!~|-i(?I<4S3j? zLuG{-8UM2|888@dgLwQbEX+*o4F<9x4j+pci%7WRe}*l4GV}CP^jDl}J|7U(Q4(Yz z50X}9kuVTz5OEM|5py|b)yTrZ%AWS($D%o@KVpz0fEyeEj0~C|xP5oEO#N`z(s8}u zww*IK73wxgxc1vdeBIKyy6pA!+pnE3R9-YZ;B{5&uJXT60UEtOx!y6DSIGpj})7_KT?y?p}hBdwEJ+){03Py!P&54yq^IGAOEXjaV4;rjb_N8v({v%X9<=o*tb+ODrK|ZQH7aTJ8IEF42 z`F>ej^#AoWQJ>39ym~e)H41Rs?8g0Icf_;zzgMb6y}F;nxc}krzsfI7Hk$^!&svo> zQTWaD>0PtFlv~Z)tk7C&bhKc3^sR5+UMpluj=bJFxiwxdj3@2OUxCS2lX#aN1^`wX BW!(S( literal 0 HcmV?d00001 diff --git a/redhatsecureboot401.cer b/redhatsecureboot401.cer deleted file mode 100644 index 247666cfed1509cec37abc4e3beb0d49a61d5932..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 978 zcmXqLVm@ck#I$VzGZP~d6DPw$2luc;8yz1S@Un4gwRyCC=VfH%W@Ru)GZZrrVPg(u z;o{*9N=;GlNG#D&@XSlrGt@9p1Bo;9$V0^yf>V=Ai&7Pw^7Bg+oE;TR6f}}jOA<8= zl?)W%hH^5B2^Xg(C+4IUl{gforeq|R=q2ap8pw(B8W|Xv8CV)vnphf`Mv3zpTNoG` zT0pr5xj5aSZ=efthZ;6_1ZSq_W#*+Tm>3w6;+!T%CFGD`WMyD(V&rEqXkz4IYGPz$ zxOt*a|83fydKaaIGdS`br5@fAZP+Qzhyhu3D3pAj_6ey;znb{1R6v4^w+YXL^=W*1wx;c%gl2n z1FI|#IrMK@dh+)3Dy_pm4PSCc-c336;PO0|bXSpc@wT}&yhZEe7doGJIluRemQY-9 z>E+g+U6&MhD5wO+U$`n1=jY89x6d-@+KLkPxuzSYG+ba}OM5Z%&o9=)K~BwwzgNf@ z?|XA@5|7W9YXQG)ztu6hNUoStUgPrO!NOjPf_>YfwIX+Yp4-s>Y6hRL>nC>Ihc{eL zNJV`YIy|vh?I{y8BLm~&3WG8O9yaDsSz$)T|13-f3AZcY52?MbP zk)VmEbC1qA7J6yvuh*>2w+@$YXjegw8*XsiFfvGSe{l&3etya^J;JKTegRjxL{oLg z%kS?47&XjNJ~V4Dd&I8P^g90Bc@D!3Klo+}bJ#DIvG^vD8lS&ev+Dr=$KAWj`|rPu zQQui}$Ezc|;=DmX(wFaM&PoN_W=f~XL|*sU>dSrQoP+YxpA%|d$z`_PoI5l3yL74E zO>Z}kY(ohiy&3;buQg7(z_w57tjM3sum8M_+Zw-XDZj4H{XKl@TastY3+&sqc$1-1 z%*4gvCs=Mj-&h{BtvM#Hd1!|uI6Eqs8Y&qmz)j<1 z6ca8^O-{^7Eh=#+N=?Z~EYVBO&oz(}=QT1gFf*_;ur#$aF^m%DHMTG?G_-(n4bpHr zK*K-{;sAMU4hYUn&&$k9S1>g&B+4C4j7rFUXJlnyZerwTFlb`rVrpV!WLSSbW=2%q*K_5Lp+g5I)^H z#`Dnk-%mbwR!=QjlT=qTCH}c?^d0uoA&WUyAN(!c_b={K-UFj(qX3D*`h8W$XRhW< zzQXk9WQ_LFh10(My1M`N=QU{owQ`py$L*cP@XEaT+@A%Us!MLo+pTlLQz@$1bgIg0 z$2z~;Ow5c7jEgG_$_#kem_ucS85#exFc~ly@PT;zARY@d6MKV!7>KV5;`11Av2kd# zF|x9i^jcvX2lT$I%+|})J!D&fWnMJ}ttU=^V{?g|f z8M{3FCePlR!9CHXY}WjK&WDz2>HO9LjVpW;e%%uGTfdku`0bgLCdur& zGco`6fB*D3`oM>!v1N|Jo$p?-gl_qiFYG^K+5-NnA15WqKd$IkCTY?ZwWISGhkN4&81j`a@j6 m@wR^$WBhUT_y2m*Z!4~R^Z4ejJyEaw^#519)lPU~6aWA(kap4l literal 0 HcmV?d00001 diff --git a/redhatsecurebootca1.cer b/redhatsecurebootca1.cer new file mode 100644 index 0000000000000000000000000000000000000000..b2354007b9668258683b99a68fa5bdd3067c31b1 GIT binary patch literal 977 zcmXqLVm@oo#I$t*GZP~d6DPykKFO2}lmD>>ylk9WZ60mkc^MhGSs4s`4b=@)*_cCF zn1$tnQd1N>5=#_OQj1C) zic(WD5=-=w^K%X4#CZ)(42%qo42?`oOiZK1d5z5tj10`6Txwg_#HfVqAx2gP<|amd z27@L>E~X|%MuyqW3d}xv(ji6Lo9FFrUJ}@P@siEYnRd0iCRc9Wzr*5?+UKAv$==!% zf35U+vZ%iAB8TAP4FU28^PH4(A1FueoA@UC)b|_#)qdlBdwQFl!vEczTKD>|M9bIq z7pWg*te?&G`f1?QasGV9b>YHXYo_Ft+}l2$;Y+Vp{*iF~v!LmQz4`@83g0e#cW)L_ z`c@hwThBi$V$JlI(gwnFbB-O!=?;(0&@6sbUi#!p2e&Fu2;YHoS+4{_{2uEXY)EJk z(OZ$R-N|{#LURRxVUk>LE{<&SvKZSSw0pq77+)r7BQD|R*fti ztn6toek_`k`Xk1m79_3AQf5%nfK|c5z$N}vj=mD}TLH=zqGPAg*Ek!fD1X+mr*>-!IpgSj4e&zFOIZTMbj~7Kpq~ z&wP-%|G>G=R-a$J%yZK4JMSj+xwYp1tjzOY;!S#T-}!BxYdh`Sw#+vZXYqXN=KATxNAgj@GQy<`rmcQSu;_bx1{9qnWiak)~m=Be~!^u-_Gl&)z3O z@2|%*+g2{#eS;_J#i{nKkM4a@)p+=Mw{_vvBY}!cvy76s1-#b=X1BKWNIx-I3LvQD5|rY4e`O-LeG@ zTfW%v1W(@jAiOC!?&vbUI)hy`&#h-a*wZ>eGx%rBshxK?XPxiwUi^$%?7i&CEl&;G z7Tx|M`_A>K%GrE3!`M_Cu4JLufX>MtR<&hmHvU}c{Krz-zx^u{J#bF-@s6syelIso z@D%)zqc67q^OqHWI7~#+o)jE;bR+8eoMy3_-#2rnZ&=;o9=_Ivm*uj(*EEkia=+T9 oAKhtG&%Gx2Fo#=Zz`+N;_m`C1ue{sPaANY}Z}o+(XF2`?0PKunc>n+a diff --git a/redhatsecurebootca4.cer b/redhatsecurebootca4.cer deleted file mode 100644 index 8cb32e68cb5e279e06ed153d983a12a48ee83e69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 934 zcmXqLVqRp>#MHHbnTe5!iIZWneUz&}74u&MUN%mxHjlRNyo`+8tPBQehGGUHY|No7 zTs*u%sVNE`i6uG;o_Wc7h8hNHAaQ0Md8oKTaB6aCQL2JdetwC9v!jBEf<{tmNus8q zl7Rx;P)4E1mup%v~LqI?UCcc=F1xU9(Qz*dH3< z;xHxUlIxTQ{ygpVd=rH~FFnQb>+-oruP@!dBke7{vF-ZPlZB2e=dUgcxmJJ2;N4?8 z-4nZd($*cB6K~mXozc)fJJ!w-XH*toh{boDbz&qrFC*iJ6gsadEIgpn)tK zbEqsIix`VY(8SZZM`s)hy|nb#Yu4slhs!s#s~E_Gq?K7D48$6+E8qty5N2fj&%$cJ z%*gm3IoP?u!OqAauDg}#=8f#_$E2qmetO&M_TSTcL)9ZQyYyW>0=-tWu+>VG`z(9- z<&^mv>kZfUxKEsLwO^;yzwng!^s{}hC-`-(Dp;i3zq{M7D&t-iquifsDZg8M)?`gC z>Uy+REvUL>>&|-dAHB~H3O>3J&N8tn zo)5fJ?+E)UjXtVaBctq diff --git a/redhatsecurebootca5.cer b/redhatsecurebootca5.cer new file mode 100644 index 0000000000000000000000000000000000000000..dfb0284954861282d1a0ce16c8c5cdc71c27659f GIT binary patch literal 920 zcmXqLVxD5q#8k6@nTe5!iIbtZm{+@~;bN2lFB_*;n@8JsUPeZ4RtAH3LoovpHs(+k zE*{>X)D#7e#1b6^&%9(kLq!95kT^4s1XNrhI5oMnC{@8JKfgr5*-^pNP{}|6ZW6NxP$#b?ru1p1aqn$3D)YB{Qqo zjCvjz?|=HkE#3AN-xTZpws*U~)f@DZ{t~uwMZy8<;F%jD%$u6!n#qYzp^Sryh{C;x9qf@!N=T4ui@b#({ zSD&^p3kNZ=9lAQ9%xdfP9doNToV+k2^LHOF$k^rSH+lBn4DN|8WwYk@gOh`-GK++PSOazi{2=|pjEw(TSPhsN8UG^(J2yDk z85v}s$2n!Cohh=L9dmO1;!`1dZ&Owu*eSkGeWhH)#z-4q!IF#9rGi*nSi5e1Xg%@u zP5+#i&pC2;Tb=%uZ)5zd!nbtq{R2~r<}(LeD%Gml()ge~X-drd^Vzqo9`DbSC@~2Q z;86)aH_^v%Ml4SCh+H~oT z=3=#}vW#p`f-)=EE*rSGY$z>16SDS6o|4l4*#DE+cz({Xnq#@0r}4t)AMDFHyYuIC zJzV?8aYn$hct+5l_p(Lm&CA>W#qO|FNt)`EuGsyG+k|J&PybPO$4TCY?`}tN QZO_yT_T>jB>`3_t0O~_xk^lez literal 0 HcmV?d00001 diff --git a/secureboot_ppc.cer b/secureboot_ppc.cer new file mode 100644 index 0000000000000000000000000000000000000000..2c0087dbc5da376aef641bb23833401857c34940 GIT binary patch literal 899 zcmXqLVy-u6VoG1Y%*4pV#L4h}zvyHQr&GoTylk9WZ60mkc^MhGSs4s`4b=@)*_cCF zn1$tnQd1N>5=#_OQj1C) zic(WD5=-=w^K%X4#CZ)Z4a^Ko3@l8IOe~_rd5tX$3=NE+T!SD(9Rn?}bv(*gtt-w< z&&$k92is{(oSjXKO31!qWMyD(V&rEqXkz4IYGPz$II>2G|M$FqPFt5GY@Z}j_wdcG z>qlNkR*SLi2#vh>#O(I_Wno7c`4SC2=y=Zd`<9;a@{@2)?V*sz8{HTFd-E&#gtt#; zUgHuWz1pJ-y#K9{o_n?Q@4oA|9nu>-nGU?#lm1zM!m(4+W^!G6o63L4^zhgAs4rhs zUmj^WrxfJ3J}dJeut1F^9?uGcx{XVKQJa;0E#dSy-5v*c%LFK^#67F&2?+<){C}3mPZ>U82r=yvFqM zG+y3Id!ZSD?Rj9wqyIB=?LvQuXA2XG?w2pq<#*{SgoVD$Q zpJ%^)w$Qq$5X&~<9>e^yCt~aZa|<1+*rpW+Dn}M{a%|jeE^fNh;UlBO*N}ZDcvHVG z$oTo~@t-;hiIzpC>crYF_-i(VN>%Uwqp730?m~+Dt#|^>Id2 z{NL&0ynMmy^Dg|kYxk_ax&Pncj5aZaCDHFJeSbT*-~Fdl#q;}K3g=8t^M1*=lddlq z@99r?V0a}!)y<({;**v)O4W^Ild=4PE41C|znUbUCv9uipC3 G2ay1J)@X(R literal 0 HcmV?d00001 diff --git a/secureboot_s390.cer b/secureboot_s390.cer new file mode 100644 index 0000000000000000000000000000000000000000..137d3858f1fc667fe1f26383e25824a936fa91e8 GIT binary patch literal 899 zcmXqLVy-u6VoG1Y%*4pV#L4h}zvyHQr&C4-ylk9WZ60mkc^MhGSs4s`4b=@)*_cCF zn1$tnQd1N>5=#_OQj1C) zic(WD5=-=w^K%X4#CZ)(3=Iv;4Gj!Ujm)FOd5z5t4GlmD#5D*q)G^S4Sf`BDy5h|A zyv)3Gu$@N4+1bRXgzPIuRtDxKMt%l^CPpr%CPqev>sH^lop-z`Xf86%M`rS=>8@dW zduA7Zl-+hU&pYwkx7qQna~;me8x9-c%e$MhUX}3_vWml zT+z=rd#A3Px72^xFSY;~N$a<1DXR`yTwJ*z$iuWOwWay3&iNHDjg^9o^>?UP6lUJC z*%mKXBmU~XLZoF~5+n1TWW&VN_~Xi!o|by^PI(^ZGrV*1|E;noSJ|1E85tNC#~MT% z@USt5$_g_w{%2t_U@+hY@%UL-n3>oc3}itZJ{B<+k%p@?uHVRbzv}(Yj9{;so3DHF zu6$-750X}9kuVTz5OEM|5py|b)yTrZ%AWS($D%o@KVpz0fEyeEj10ya(m&>2mvfQZ z*36NdxAFb2^#?b2bkCp1{P;o2!i4GdYYRi$S6tHKSQGk^|L~qkl4pbCQaiO3a+1AL zcFat!_Ij`Ib?)TDy?eg>Ub<-0RNLP3xjmbM zul4EU%njlOg{nI}FK;%P`Tyv_duu1e+c&>gyT)wn7I?k)qV?GpxA&0~Omd%a?SII% zY0A+vQqsC@_YHqd^__o>-|>^m&uz=K?S6YOBt4wQlD_X##^?&`;+bEGi}rB zijdPkcy`Rq+}^V5=)J$2_G H=*&I Date: Fri, 3 Mar 2023 07:16:58 -0600 Subject: [PATCH 02/87] kernel-6.2.2-300 * Fri Mar 03 2023 Justin M. Forbes [6.2.2-0] - Turn off DEBUG_INFO_COMPRESSED_ZLIB for Fedora (Justin M. Forbes) - Linux v6.2.2 Resolves: Signed-off-by: Justin M. Forbes --- kernel-aarch64-debug-fedora.config | 4 ++-- kernel-aarch64-fedora.config | 4 ++-- kernel-armv7hl-debug-fedora.config | 4 ++-- kernel-armv7hl-fedora.config | 4 ++-- kernel-armv7hl-lpae-debug-fedora.config | 4 ++-- kernel-armv7hl-lpae-fedora.config | 4 ++-- kernel-s390x-debug-fedora.config | 4 ++-- kernel-s390x-fedora.config | 4 ++-- kernel-x86_64-debug-fedora.config | 4 ++-- kernel-x86_64-fedora.config | 4 ++-- kernel.spec | 17 ++++++++++++++--- patch-6.2-redhat.patch | 8 ++++---- sources | 6 +++--- 13 files changed, 41 insertions(+), 30 deletions(-) diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index afe5f108f..0d80e5980 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1608,8 +1608,8 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 297f6909e..0840683a9 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1608,8 +1608,8 @@ 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_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index c2e7338e5..a3cdc454f 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1566,8 +1566,8 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index c9a5b50fd..25a59b9f0 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1566,8 +1566,8 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index e12041714..3e73c9021 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1535,8 +1535,8 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 8850cd39f..69353c943 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1535,8 +1535,8 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 1d21e60ea..8cbf34515 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1207,8 +1207,8 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 34fc25fcf..cfbb8d7ab 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1206,8 +1206,8 @@ 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_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 08e674875..34fdd5988 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1301,8 +1301,8 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 1dc15632f..cc6bca987 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1300,8 +1300,8 @@ 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_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel.spec b/kernel.spec index 1f96817e7..ea387edad 100755 --- a/kernel.spec +++ b/kernel.spec @@ -145,17 +145,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.1 +%define specversion 6.2.2 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.1 +%define tarfile_release 6.2.2 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.1 +%define kabiversion 6.2.2 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -726,7 +726,11 @@ BuildRequires: dracut BuildRequires: binutils # For the initrd BuildRequires: lvm2 +%if 0%{?fedora} > 37 +# The UKI code was introduced in Fedora 38 and is not needed by +# earlier versions. This wrapper can be removed in Fedora 41. BuildRequires: systemd-boot-unsigned +%endif # For systemd-stub and systemd-pcrphase BuildRequires: systemd-udev >= 252-1 # For TPM operations in UKI initramfs @@ -3343,6 +3347,13 @@ fi # # %changelog +* Fri Mar 03 2023 Justin M. Forbes [6.2.2-300] +- redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency (Prarit Bhargava) + +* Fri Mar 03 2023 Justin M. Forbes [6.2.2-0] +- Turn off DEBUG_INFO_COMPRESSED_ZLIB for Fedora (Justin M. Forbes) +- Linux v6.2.2 + * Sat Feb 25 2023 Justin M. Forbes [6.2.1-0] - Add UKI revert patch to allow builds on F36 and F37 (Justin M. Forbes) - Turn E1000 back on (Justin M. Forbes) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 01cef62b5..28280a683 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -36,7 +36,7 @@ 35 files changed, 980 insertions(+), 177 deletions(-) diff --git a/Makefile b/Makefile -index f26824f367a9..540a8364178e 100644 +index 1836ddaf2c94..eb1d58681256 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1011,10 +1011,10 @@ index 285acc4aaccc..a7056957e7dd 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 9eca403af2a8..ebe803d4ad4d 100644 +index 97a0f8faea6e..d837548d2024 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5735,6 +5735,13 @@ static void hub_event(struct work_struct *work) +@@ -5734,6 +5734,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); @@ -1706,7 +1706,7 @@ index a2ff4242e623..f0d2be1ee4f1 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/scripts/tags.sh b/scripts/tags.sh -index e137cf15aae9..2ed2341f7967 100755 +index 0d045182c08c..8606325b0ec2 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -16,6 +16,8 @@ fi diff --git a/sources b/sources index ead7687ba..891330869 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.1.tar.xz) = 898974720565ef2423c1a8b74575e48280a1939418a1018443bb89bea81c5654b7034ab4eb58d5ae8c364aa6ae86b5d632df3976ccd2279f07ae06db60528ecf -SHA512 (kernel-abi-stablelists-6.2.1.tar.bz2) = efd5f2ec8ca2a3cdca76d5003c3ddaf704f2673dba865c876835ad241f3e681198453f2f60ff45094377a55380ba1132e12499251f8829588fff03c976b91a86 -SHA512 (kernel-kabi-dw-6.2.1.tar.bz2) = 221c668cffd283f69df51282dbfcf923f1be8cf12d8b094892da4aa8995a900fc7a0494e962322383f3069acf4beba0d8fbcb98c36342cf3e34be9614337c40a +SHA512 (linux-6.2.2.tar.xz) = 155b0e21bde6f1cc6d410e588ca120cee6b4b056079e43d1b090a3e707859b5bf538ce2736d7cfc4f1455b9042a09ed5b1b37182e879264fed74c7913f253830 +SHA512 (kernel-abi-stablelists-6.2.2.tar.bz2) = e1e92d3807b2aefb7ac69b637ff9a9ceed9ed76e8eddbfc2a3035cb35a1fce81b64e7a3c44fe12df85f93861111c40cbb521fea53c70ca287224dfddc62d5d2b +SHA512 (kernel-kabi-dw-6.2.2.tar.bz2) = d6b74c79ec7d45a7b27c47b888078fe4275e04f04b27970217828a884c48bb5f795435fa70a6b8b7dc802f1d94a80af272b53d122b892cda0ba1d803853f755a From 786690a9266d261a4faf4db60ab8a4e4403e44f2 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 3 Mar 2023 09:53:29 -0600 Subject: [PATCH 03/87] Drop version requirement for systemd-udev Signed-off-by: Justin M. Forbes --- kernel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index ea387edad..09067fd92 100755 --- a/kernel.spec +++ b/kernel.spec @@ -732,7 +732,7 @@ BuildRequires: lvm2 BuildRequires: systemd-boot-unsigned %endif # For systemd-stub and systemd-pcrphase -BuildRequires: systemd-udev >= 252-1 +BuildRequires: systemd-udev # For TPM operations in UKI initramfs BuildRequires: tpm2-tools %endif From a30ca910db7d301a4d1ec877bb25a7042468bc96 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 7 Mar 2023 10:52:56 -0600 Subject: [PATCH 04/87] kernel-6.2.2-301 * Tue Mar 07 2023 Justin M. Forbes [6.2.2-1] - Bump for rebuild (Justin M. Forbes) - iommu/amd: Do not identity map v2 capable device when snp is enabled (Vasant Hegde) - iommu: Attach device group to old domain in error path (Vasant Hegde) - iommu/amd: Improve page fault error reporting (Vasant Hegde) - iommu/amd: Skip attach device domain is same as new domain (Vasant Hegde) - iommu/amd: Fix error handling for pdev_pri_ats_enable() (Vasant Hegde) - redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency (Prarit Bhargava) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 15 +++++ kernel.spec | 14 +++-- patch-6.2-redhat.patch | 124 +++++++++++++++++++++++++++++++++++++++-- sources | 4 +- 5 files changed, 148 insertions(+), 11 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index bedf1e208..aa2689307 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 = 0 +RHEL_RELEASE = 1 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index 3c2ae8e4c..7e17ec4d8 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,18 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/a95fa0b4dd6a8a8aa27d72c95cd8fc522f420996 + a95fa0b4dd6a8a8aa27d72c95cd8fc522f420996 iommu/amd: Do not identity map v2 capable device when snp is enabled + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/50c9147bec083a83e10799bb127c4e730c24ba11 + 50c9147bec083a83e10799bb127c4e730c24ba11 iommu: Attach device group to old domain in error path + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/3a4e60e72603ce11dd24f8dec42c0e4c4339b1b7 + 3a4e60e72603ce11dd24f8dec42c0e4c4339b1b7 iommu/amd: Improve page fault error reporting + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/70ec5b043f0debccfae70b702f7741a9e07ef42e + 70ec5b043f0debccfae70b702f7741a9e07ef42e iommu/amd: Skip attach device domain is same as new domain + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/42eaef1e4db25a79c5f24219373de3fff6591a6a + 42eaef1e4db25a79c5f24219373de3fff6591a6a iommu/amd: Fix error handling for pdev_pri_ats_enable() + "https://gitlab.com/cki-project/kernel-ark/-/commit"/807d6b912b28183332ea9e78afaf9bc2f47559dd 807d6b912b28183332ea9e78afaf9bc2f47559dd drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set diff --git a/kernel.spec b/kernel.spec index 09067fd92..ddf234738 100755 --- a/kernel.spec +++ b/kernel.spec @@ -147,13 +147,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.2.2 %define patchversion 6.2 -%define pkgrelease 300 +%define pkgrelease 301 %define kversion 6 %define tarfile_release 6.2.2 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 300%{?buildid}%{?dist} +%define specrelease 301%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.2 @@ -732,7 +732,7 @@ BuildRequires: lvm2 BuildRequires: systemd-boot-unsigned %endif # For systemd-stub and systemd-pcrphase -BuildRequires: systemd-udev +BuildRequires: systemd-udev >= 252-1 # For TPM operations in UKI initramfs BuildRequires: tpm2-tools %endif @@ -3347,7 +3347,13 @@ fi # # %changelog -* Fri Mar 03 2023 Justin M. Forbes [6.2.2-300] +* Tue Mar 07 2023 Justin M. Forbes [6.2.2-1] +- Bump for rebuild (Justin M. Forbes) +- iommu/amd: Do not identity map v2 capable device when snp is enabled (Vasant Hegde) +- iommu: Attach device group to old domain in error path (Vasant Hegde) +- iommu/amd: Improve page fault error reporting (Vasant Hegde) +- iommu/amd: Skip attach device domain is same as new domain (Vasant Hegde) +- iommu/amd: Fix error handling for pdev_pri_ats_enable() (Vasant Hegde) - redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency (Prarit Bhargava) * Fri Mar 03 2023 Justin M. Forbes [6.2.2-0] diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 28280a683..f3c099cee 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -18,7 +18,8 @@ drivers/hid/hid-rmi.c | 66 --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 + drivers/input/rmi4/rmi_driver.c | 124 +++-- - drivers/iommu/iommu.c | 22 + + drivers/iommu/amd/iommu.c | 41 +- + drivers/iommu/iommu.c | 38 +- drivers/pci/quirks.c | 24 + drivers/usb/core/hub.c | 7 + include/linux/efi.h | 22 +- @@ -33,7 +34,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 35 files changed, 980 insertions(+), 177 deletions(-) + 36 files changed, 1027 insertions(+), 187 deletions(-) diff --git a/Makefile b/Makefile index 1836ddaf2c94..eb1d58681256 100644 @@ -935,8 +936,99 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ +diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c +index cbeaab55c0db..ff4f3d4da340 100644 +--- a/drivers/iommu/amd/iommu.c ++++ b/drivers/iommu/amd/iommu.c +@@ -558,6 +558,15 @@ static void amd_iommu_report_page_fault(struct amd_iommu *iommu, + * prevent logging it. + */ + if (IS_IOMMU_MEM_TRANSACTION(flags)) { ++ /* Device not attached to domain properly */ ++ if (dev_data->domain == NULL) { ++ pr_err_ratelimited("Event logged [Device not attached to domain properly]\n"); ++ pr_err_ratelimited(" device=%04x:%02x:%02x.%x domain=0x%04x\n", ++ iommu->pci_seg->id, PCI_BUS_NUM(devid), PCI_SLOT(devid), ++ PCI_FUNC(devid), domain_id); ++ goto out; ++ } ++ + if (!report_iommu_fault(&dev_data->domain->domain, + &pdev->dev, address, + IS_WRITE_REQUEST(flags) ? +@@ -1702,27 +1711,29 @@ static int pdev_pri_ats_enable(struct pci_dev *pdev) + /* Only allow access to user-accessible pages */ + ret = pci_enable_pasid(pdev, 0); + if (ret) +- goto out_err; ++ return ret; + + /* First reset the PRI state of the device */ + ret = pci_reset_pri(pdev); + if (ret) +- goto out_err; ++ goto out_err_pasid; + + /* Enable PRI */ + /* FIXME: Hardcode number of outstanding requests for now */ + ret = pci_enable_pri(pdev, 32); + if (ret) +- goto out_err; ++ goto out_err_pasid; + + ret = pci_enable_ats(pdev, PAGE_SHIFT); + if (ret) +- goto out_err; ++ goto out_err_pri; + + return 0; + +-out_err: ++out_err_pri: + pci_disable_pri(pdev); ++ ++out_err_pasid: + pci_disable_pasid(pdev); + + return ret; +@@ -2159,6 +2170,13 @@ static int amd_iommu_attach_device(struct iommu_domain *dom, + struct amd_iommu *iommu = rlookup_amd_iommu(dev); + int ret; + ++ /* ++ * Skip attach device to domain if new domain is same as ++ * devices current domain ++ */ ++ if (dev_data->domain == domain) ++ return 0; ++ + dev_data->defer_attach = false; + + if (dev_data->domain) +@@ -2387,12 +2405,17 @@ static int amd_iommu_def_domain_type(struct device *dev) + return 0; + + /* +- * Do not identity map IOMMUv2 capable devices when memory encryption is +- * active, because some of those devices (AMD GPUs) don't have the +- * encryption bit in their DMA-mask and require remapping. ++ * Do not identity map IOMMUv2 capable devices when: ++ * - memory encryption is active, because some of those devices ++ * (AMD GPUs) don't have the encryption bit in their DMA-mask ++ * and require remapping. ++ * - SNP is enabled, because it prohibits DTE[Mode]=0. + */ +- if (!cc_platform_has(CC_ATTR_MEM_ENCRYPT) && dev_data->iommu_v2) ++ if (dev_data->iommu_v2 && ++ !cc_platform_has(CC_ATTR_MEM_ENCRYPT) && ++ !amd_iommu_snp_en) { + return IOMMU_DOMAIN_IDENTITY; ++ } + + return 0; + } diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 5f6a85aea501..3b1e9faa9c2d 100644 +index 5f6a85aea501..026487698b25 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -947,7 +1039,31 @@ index 5f6a85aea501..3b1e9faa9c2d 100644 #include #include #include -@@ -2793,6 +2794,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) +@@ -2124,8 +2125,22 @@ static int __iommu_attach_group(struct iommu_domain *domain, + + ret = __iommu_group_for_each_dev(group, domain, + iommu_group_do_attach_device); +- if (ret == 0) ++ if (ret == 0) { + group->domain = domain; ++ } else { ++ /* ++ * To recover from the case when certain device within the ++ * group fails to attach to the new domain, we need force ++ * attaching all devices back to the old domain. The old ++ * domain is compatible for all devices in the group, ++ * hence the iommu driver should always return success. ++ */ ++ struct iommu_domain *old_domain = group->domain; ++ ++ group->domain = NULL; ++ WARN(__iommu_group_set_domain(group, old_domain), ++ "iommu driver failed to attach a compatible domain"); ++ } + + return ret; + } +@@ -2793,6 +2808,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) } EXPORT_SYMBOL_GPL(iommu_dev_disable_feature); diff --git a/sources b/sources index 891330869..b55121c49 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-6.2.2.tar.xz) = 155b0e21bde6f1cc6d410e588ca120cee6b4b056079e43d1b090a3e707859b5bf538ce2736d7cfc4f1455b9042a09ed5b1b37182e879264fed74c7913f253830 -SHA512 (kernel-abi-stablelists-6.2.2.tar.bz2) = e1e92d3807b2aefb7ac69b637ff9a9ceed9ed76e8eddbfc2a3035cb35a1fce81b64e7a3c44fe12df85f93861111c40cbb521fea53c70ca287224dfddc62d5d2b -SHA512 (kernel-kabi-dw-6.2.2.tar.bz2) = d6b74c79ec7d45a7b27c47b888078fe4275e04f04b27970217828a884c48bb5f795435fa70a6b8b7dc802f1d94a80af272b53d122b892cda0ba1d803853f755a +SHA512 (kernel-abi-stablelists-6.2.2.tar.bz2) = 3ad5cdf2251ad557ce536e230434d454813571147de7566d8838903c54c923caa55db73cb9ca0c9ae4338d8bb9b43a38732646d643c6cbeee3b830dbff1400a2 +SHA512 (kernel-kabi-dw-6.2.2.tar.bz2) = 9560700ab830ef3f65a7fe0b561b5323b8d8d88054d20436fc679e6b6e6d627f4c71a94161d0187925bb3a357d11b34441672e947da637cdd9dba4728f3c8764 From 100bc30f0478a62501f6772ccb060e5d7cf32eac Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 10 Mar 2023 08:31:04 -0600 Subject: [PATCH 05/87] kernel-6.2.3-300 * Fri Mar 10 2023 Justin M. Forbes [6.2.3-0] - Add new config option for 6.2.3 (Justin M. Forbes) - Only build the efiuki for F37 and newer (Justin M. Forbes) - Reset release (Justin M. Forbes) - Linux v6.2.3 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 1 + kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 1 + kernel-aarch64-rhel.config | 1 + kernel-armv7hl-debug-fedora.config | 1 + kernel-armv7hl-fedora.config | 1 + kernel-armv7hl-lpae-debug-fedora.config | 1 + kernel-armv7hl-lpae-fedora.config | 1 + kernel-ppc64le-debug-fedora.config | 1 + kernel-ppc64le-debug-rhel.config | 1 + kernel-ppc64le-fedora.config | 1 + kernel-ppc64le-rhel.config | 1 + kernel-s390x-debug-fedora.config | 1 + kernel-s390x-debug-rhel.config | 1 + kernel-s390x-fedora.config | 1 + kernel-s390x-rhel.config | 1 + kernel-s390x-zfcpdump-rhel.config | 1 + kernel-x86_64-debug-fedora.config | 1 + kernel-x86_64-debug-rhel.config | 1 + kernel-x86_64-fedora.config | 1 + kernel-x86_64-rhel.config | 1 + kernel.spec | 22 ++-- patch-6.2-redhat.patch | 150 +++--------------------- sources | 6 +- 25 files changed, 55 insertions(+), 146 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index aa2689307..bedf1e208 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 = 1 +RHEL_RELEASE = 0 # # ZSTREAM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 0d80e5980..ccfdc0b3e 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -7084,6 +7084,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index abf76114d..8da52ac59 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -5567,6 +5567,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 0840683a9..f0074ca21 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -7063,6 +7063,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 93be678a5..a4dcff81e 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -5544,6 +5544,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index a3cdc454f..a78ee57e3 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -7087,6 +7087,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 25a59b9f0..6397ec7e1 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -7068,6 +7068,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 3e73c9021..4afba539d 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6899,6 +6899,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 69353c943..0e2356467 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6880,6 +6880,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index e8ddd1062..9c49dbf8e 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5910,6 +5910,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 56b368b32..548d73119 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -5323,6 +5323,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f7abfa2be..1232358f7 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5889,6 +5889,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index d59a9758a..a6993b40a 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -5302,6 +5302,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 8cbf34515..523a05322 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5851,6 +5851,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 1357df7f0..e4c762b0f 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -5300,6 +5300,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index cfbb8d7ab..b458fd563 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5830,6 +5830,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 464d750db..27e3df5b9 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -5279,6 +5279,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index e29d99df3..c2d5c76e2 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -5299,6 +5299,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 34fdd5988..4baac6a75 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6282,6 +6282,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index d862ff44c..0913e4fa6 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -5526,6 +5526,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index cc6bca987..bdc3b50f9 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6262,6 +6262,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index e710246e5..bbb6d7bc1 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -5504,6 +5504,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 diff --git a/kernel.spec b/kernel.spec index ddf234738..33ec7e4f3 100755 --- a/kernel.spec +++ b/kernel.spec @@ -107,7 +107,9 @@ Summary: The Linux kernel %endif %ifarch x86_64 +%if 0%{?fedora} > 36 %global efiuki 1 +%endif %else %global efiuki 0 %endif @@ -145,17 +147,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.2 +%define specversion 6.2.3 %define patchversion 6.2 -%define pkgrelease 301 +%define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.2 +%define tarfile_release 6.2.3 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 301%{?buildid}%{?dist} +%define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.2 +%define kabiversion 6.2.3 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -726,11 +728,7 @@ BuildRequires: dracut BuildRequires: binutils # For the initrd BuildRequires: lvm2 -%if 0%{?fedora} > 37 -# The UKI code was introduced in Fedora 38 and is not needed by -# earlier versions. This wrapper can be removed in Fedora 41. BuildRequires: systemd-boot-unsigned -%endif # For systemd-stub and systemd-pcrphase BuildRequires: systemd-udev >= 252-1 # For TPM operations in UKI initramfs @@ -3347,6 +3345,12 @@ fi # # %changelog +* Fri Mar 10 2023 Justin M. Forbes [6.2.3-0] +- Add new config option for 6.2.3 (Justin M. Forbes) +- Only build the efiuki for F37 and newer (Justin M. Forbes) +- Reset release (Justin M. Forbes) +- Linux v6.2.3 + * Tue Mar 07 2023 Justin M. Forbes [6.2.2-1] - Bump for rebuild (Justin M. Forbes) - iommu/amd: Do not identity map v2 capable device when snp is enabled (Vasant Hegde) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index f3c099cee..c27bfcc9f 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -18,8 +18,7 @@ drivers/hid/hid-rmi.c | 66 --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 + drivers/input/rmi4/rmi_driver.c | 124 +++-- - drivers/iommu/amd/iommu.c | 41 +- - drivers/iommu/iommu.c | 38 +- + drivers/iommu/iommu.c | 22 + drivers/pci/quirks.c | 24 + drivers/usb/core/hub.c | 7 + include/linux/efi.h | 22 +- @@ -34,10 +33,10 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 36 files changed, 1027 insertions(+), 187 deletions(-) + 35 files changed, 980 insertions(+), 177 deletions(-) diff --git a/Makefile b/Makefile -index 1836ddaf2c94..eb1d58681256 100644 +index eef164b4172a..e38d656104e5 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -68,10 +67,10 @@ index 43c7773b89ae..2c1db1cb5528 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 c5ccca26a408..4cacdb4ab764 100644 +index ddfd35c86bda..2b69e42dff58 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1234,7 +1234,7 @@ endchoice +@@ -1233,7 +1233,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -80,7 +79,7 @@ index c5ccca26a408..4cacdb4ab764 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 -@@ -1473,6 +1473,7 @@ config XEN +@@ -1472,6 +1472,7 @@ config XEN config ARCH_FORCE_MAX_ORDER int default "14" if ARM64_64K_PAGES @@ -101,10 +100,10 @@ index b0d00032479d..afb9544fb007 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index fbd646dbf440..23ca9cdb2438 100644 +index bcf03939e6fe..3773e027b034 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c -@@ -2568,3 +2568,8 @@ int ipl_report_free(struct ipl_report *report) +@@ -2520,3 +2520,8 @@ int ipl_report_free(struct ipl_report *report) } #endif @@ -694,7 +693,7 @@ index 84e7ba5314d3..efc96776f761 100644 data->xport.ops = &hid_rmi_ops; diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c -index 1cc052979e01..c817bc0a90c5 100644 +index 77bca6932f01..27f5455aef6c 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -9,6 +9,7 @@ @@ -705,7 +704,7 @@ index 1cc052979e01..c817bc0a90c5 100644 #include #include #include -@@ -2210,6 +2211,16 @@ static const struct amba_id etm4_ids[] = { +@@ -2216,6 +2217,16 @@ static const struct amba_id etm4_ids[] = { {}, }; @@ -722,7 +721,7 @@ index 1cc052979e01..c817bc0a90c5 100644 MODULE_DEVICE_TABLE(amba, etm4_ids); static struct amba_driver etm4x_amba_driver = { -@@ -2243,6 +2254,11 @@ static int __init etm4x_init(void) +@@ -2249,6 +2260,11 @@ static int __init etm4x_init(void) { int ret; @@ -734,7 +733,7 @@ index 1cc052979e01..c817bc0a90c5 100644 ret = etm4_pm_setup(); /* etm4_pm_setup() does its own cleanup - exit on error */ -@@ -2269,6 +2285,9 @@ static int __init etm4x_init(void) +@@ -2275,6 +2291,9 @@ static int __init etm4x_init(void) static void __exit etm4x_exit(void) { @@ -936,99 +935,8 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ -diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c -index cbeaab55c0db..ff4f3d4da340 100644 ---- a/drivers/iommu/amd/iommu.c -+++ b/drivers/iommu/amd/iommu.c -@@ -558,6 +558,15 @@ static void amd_iommu_report_page_fault(struct amd_iommu *iommu, - * prevent logging it. - */ - if (IS_IOMMU_MEM_TRANSACTION(flags)) { -+ /* Device not attached to domain properly */ -+ if (dev_data->domain == NULL) { -+ pr_err_ratelimited("Event logged [Device not attached to domain properly]\n"); -+ pr_err_ratelimited(" device=%04x:%02x:%02x.%x domain=0x%04x\n", -+ iommu->pci_seg->id, PCI_BUS_NUM(devid), PCI_SLOT(devid), -+ PCI_FUNC(devid), domain_id); -+ goto out; -+ } -+ - if (!report_iommu_fault(&dev_data->domain->domain, - &pdev->dev, address, - IS_WRITE_REQUEST(flags) ? -@@ -1702,27 +1711,29 @@ static int pdev_pri_ats_enable(struct pci_dev *pdev) - /* Only allow access to user-accessible pages */ - ret = pci_enable_pasid(pdev, 0); - if (ret) -- goto out_err; -+ return ret; - - /* First reset the PRI state of the device */ - ret = pci_reset_pri(pdev); - if (ret) -- goto out_err; -+ goto out_err_pasid; - - /* Enable PRI */ - /* FIXME: Hardcode number of outstanding requests for now */ - ret = pci_enable_pri(pdev, 32); - if (ret) -- goto out_err; -+ goto out_err_pasid; - - ret = pci_enable_ats(pdev, PAGE_SHIFT); - if (ret) -- goto out_err; -+ goto out_err_pri; - - return 0; - --out_err: -+out_err_pri: - pci_disable_pri(pdev); -+ -+out_err_pasid: - pci_disable_pasid(pdev); - - return ret; -@@ -2159,6 +2170,13 @@ static int amd_iommu_attach_device(struct iommu_domain *dom, - struct amd_iommu *iommu = rlookup_amd_iommu(dev); - int ret; - -+ /* -+ * Skip attach device to domain if new domain is same as -+ * devices current domain -+ */ -+ if (dev_data->domain == domain) -+ return 0; -+ - dev_data->defer_attach = false; - - if (dev_data->domain) -@@ -2387,12 +2405,17 @@ static int amd_iommu_def_domain_type(struct device *dev) - return 0; - - /* -- * Do not identity map IOMMUv2 capable devices when memory encryption is -- * active, because some of those devices (AMD GPUs) don't have the -- * encryption bit in their DMA-mask and require remapping. -+ * Do not identity map IOMMUv2 capable devices when: -+ * - memory encryption is active, because some of those devices -+ * (AMD GPUs) don't have the encryption bit in their DMA-mask -+ * and require remapping. -+ * - SNP is enabled, because it prohibits DTE[Mode]=0. - */ -- if (!cc_platform_has(CC_ATTR_MEM_ENCRYPT) && dev_data->iommu_v2) -+ if (dev_data->iommu_v2 && -+ !cc_platform_has(CC_ATTR_MEM_ENCRYPT) && -+ !amd_iommu_snp_en) { - return IOMMU_DOMAIN_IDENTITY; -+ } - - return 0; - } diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 5f6a85aea501..026487698b25 100644 +index 50d858f36a81..d217c6b2c532 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1039,31 +947,7 @@ index 5f6a85aea501..026487698b25 100644 #include #include #include -@@ -2124,8 +2125,22 @@ static int __iommu_attach_group(struct iommu_domain *domain, - - ret = __iommu_group_for_each_dev(group, domain, - iommu_group_do_attach_device); -- if (ret == 0) -+ if (ret == 0) { - group->domain = domain; -+ } else { -+ /* -+ * To recover from the case when certain device within the -+ * group fails to attach to the new domain, we need force -+ * attaching all devices back to the old domain. The old -+ * domain is compatible for all devices in the group, -+ * hence the iommu driver should always return success. -+ */ -+ struct iommu_domain *old_domain = group->domain; -+ -+ group->domain = NULL; -+ WARN(__iommu_group_set_domain(group, old_domain), -+ "iommu driver failed to attach a compatible domain"); -+ } - - return ret; - } -@@ -2793,6 +2808,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) +@@ -2811,6 +2812,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) } EXPORT_SYMBOL_GPL(iommu_dev_disable_feature); @@ -1092,7 +976,7 @@ index 5f6a85aea501..026487698b25 100644 * Changes the default domain of an iommu group that has *only* one device * diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 285acc4aaccc..a7056957e7dd 100644 +index 20ac67d59034..1c1eb7feb5d4 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4296,6 +4296,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -1895,10 +1779,10 @@ index a79b985e917e..772a69bf43ec 100644 static int __init lockdown_lsm_init(void) diff --git a/security/security.c b/security/security.c -index d1571900a8c7..9e6be637ab68 100644 +index 174afa4fad81..7ee7bcef4313 100644 --- a/security/security.c +++ b/security/security.c -@@ -2705,6 +2705,12 @@ int security_locked_down(enum lockdown_reason what) +@@ -2706,6 +2706,12 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); diff --git a/sources b/sources index b55121c49..be9324de5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.2.tar.xz) = 155b0e21bde6f1cc6d410e588ca120cee6b4b056079e43d1b090a3e707859b5bf538ce2736d7cfc4f1455b9042a09ed5b1b37182e879264fed74c7913f253830 -SHA512 (kernel-abi-stablelists-6.2.2.tar.bz2) = 3ad5cdf2251ad557ce536e230434d454813571147de7566d8838903c54c923caa55db73cb9ca0c9ae4338d8bb9b43a38732646d643c6cbeee3b830dbff1400a2 -SHA512 (kernel-kabi-dw-6.2.2.tar.bz2) = 9560700ab830ef3f65a7fe0b561b5323b8d8d88054d20436fc679e6b6e6d627f4c71a94161d0187925bb3a357d11b34441672e947da637cdd9dba4728f3c8764 +SHA512 (linux-6.2.3.tar.xz) = 4040ac868957608da771a5701808240899333841d0070ba0d82c69085a81c9f84aa8b8831138e99de72ccb8347e453a7acaeac73e21af04cebd4e17181caba25 +SHA512 (kernel-abi-stablelists-6.2.3.tar.bz2) = 77475eb8890c13e0e4c51e9c678006099c4d2d9a87d1444ecd5937974a4b2a4b9bae552de2e26cdfff1b06c8e0acdf4f321661daaa5a573efdb99e42b3aa27a5 +SHA512 (kernel-kabi-dw-6.2.3.tar.bz2) = b114e6a275c3b5d208f055269943308c410f2c0a7186e07daaac2cbe8a7c03980e1e8d88426e63f406ffa720dccb0c5eea7c40aed8aa42bf67edde6ccf60a7fd From 13d789775440b9e04e6da3b950dac4dba1352197 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 10 Mar 2023 10:13:24 -0600 Subject: [PATCH 06/87] fix up buildreqs Signed-off-by: Justin M. Forbes --- kernel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 33ec7e4f3..4aeb73e4f 100755 --- a/kernel.spec +++ b/kernel.spec @@ -730,7 +730,7 @@ BuildRequires: binutils BuildRequires: lvm2 BuildRequires: systemd-boot-unsigned # For systemd-stub and systemd-pcrphase -BuildRequires: systemd-udev >= 252-1 +BuildRequires: systemd-udev # For TPM operations in UKI initramfs BuildRequires: tpm2-tools %endif From aad967e16a5425517934f0a0f7d044c11e11aff4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sat, 11 Mar 2023 08:51:21 -0600 Subject: [PATCH 07/87] kernel-6.2.5-300 * Sat Mar 11 2023 Justin M. Forbes [6.2.5-0] - Revert "wifi: cfg80211: Fix use after free for wext" (Justin M. Forbes) - Fix up buildReqs for UKI (Justin M. Forbes) - Linux v6.2.5 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 ++ kernel.spec | 14 ++++++-- patch-6.2-redhat.patch | 81 +++++++++++++++++++++++++++++++++++++++--- sources | 6 ++-- 4 files changed, 93 insertions(+), 11 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 7e17ec4d8..4f89e841b 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/d2fdc4eb94179d410f628f7f56a6740d6d7f6540 + d2fdc4eb94179d410f628f7f56a6740d6d7f6540 Revert "wifi: cfg80211: Fix use after free for wext" + "https://gitlab.com/cki-project/kernel-ark/-/commit"/a95fa0b4dd6a8a8aa27d72c95cd8fc522f420996 a95fa0b4dd6a8a8aa27d72c95cd8fc522f420996 iommu/amd: Do not identity map v2 capable device when snp is enabled diff --git a/kernel.spec b/kernel.spec index 4aeb73e4f..346aedef2 100755 --- a/kernel.spec +++ b/kernel.spec @@ -147,17 +147,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.3 +%define specversion 6.2.5 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.3 +%define tarfile_release 6.2.5 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.3 +%define kabiversion 6.2.5 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3345,6 +3345,14 @@ fi # # %changelog +* Sat Mar 11 2023 Justin M. Forbes [6.2.5-300] +- Drop the applypatches for f37 (Justin M. Forbes) + +* Sat Mar 11 2023 Justin M. Forbes [6.2.5-0] +- Revert "wifi: cfg80211: Fix use after free for wext" (Justin M. Forbes) +- Fix up buildReqs for UKI (Justin M. Forbes) +- Linux v6.2.5 + * Fri Mar 10 2023 Justin M. Forbes [6.2.3-0] - Add new config option for 6.2.3 (Justin M. Forbes) - Only build the efiuki for F37 and newer (Justin M. Forbes) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index c27bfcc9f..c3dc3eb97 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -28,15 +28,16 @@ include/linux/rmi.h | 1 + include/linux/security.h | 5 + kernel/module/signing.c | 9 +- + net/wireless/sme.c | 31 +- scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 35 files changed, 980 insertions(+), 177 deletions(-) + 36 files changed, 985 insertions(+), 203 deletions(-) diff --git a/Makefile b/Makefile -index eef164b4172a..e38d656104e5 100644 +index 1a1d63f2a9ed..eaa3abdb6864 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -936,7 +937,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 50d858f36a81..d217c6b2c532 100644 +index f8100067502f..e0823c45e2fa 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -947,7 +948,7 @@ index 50d858f36a81..d217c6b2c532 100644 #include #include #include -@@ -2811,6 +2812,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) +@@ -2813,6 +2814,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) } EXPORT_SYMBOL_GPL(iommu_dev_disable_feature); @@ -976,7 +977,7 @@ index 50d858f36a81..d217c6b2c532 100644 * Changes the default domain of an iommu group that has *only* one device * diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 20ac67d59034..1c1eb7feb5d4 100644 +index 494fa46f5767..27bc8dd45ad8 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4296,6 +4296,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -1705,6 +1706,76 @@ index a2ff4242e623..f0d2be1ee4f1 100644 } int module_sig_check(struct load_info *info, int flags) +diff --git a/net/wireless/sme.c b/net/wireless/sme.c +index 4f813e346a8b..696c6ac76948 100644 +--- a/net/wireless/sme.c ++++ b/net/wireless/sme.c +@@ -285,15 +285,6 @@ void cfg80211_conn_work(struct work_struct *work) + wiphy_unlock(&rdev->wiphy); + } + +-static void cfg80211_step_auth_next(struct cfg80211_conn *conn, +- struct cfg80211_bss *bss) +-{ +- memcpy(conn->bssid, bss->bssid, ETH_ALEN); +- conn->params.bssid = conn->bssid; +- conn->params.channel = bss->channel; +- conn->state = CFG80211_CONN_AUTHENTICATE_NEXT; +-} +- + /* Returned bss is reference counted and must be cleaned up appropriately. */ + static struct cfg80211_bss *cfg80211_get_conn_bss(struct wireless_dev *wdev) + { +@@ -311,7 +302,10 @@ static struct cfg80211_bss *cfg80211_get_conn_bss(struct wireless_dev *wdev) + if (!bss) + return NULL; + +- cfg80211_step_auth_next(wdev->conn, bss); ++ memcpy(wdev->conn->bssid, bss->bssid, ETH_ALEN); ++ wdev->conn->params.bssid = wdev->conn->bssid; ++ wdev->conn->params.channel = bss->channel; ++ wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT; + schedule_work(&rdev->conn_work); + + return bss; +@@ -603,12 +597,7 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, + wdev->conn->params.ssid_len = wdev->u.client.ssid_len; + + /* see if we have the bss already */ +- bss = cfg80211_get_bss(wdev->wiphy, wdev->conn->params.channel, +- wdev->conn->params.bssid, +- wdev->conn->params.ssid, +- wdev->conn->params.ssid_len, +- wdev->conn_bss_type, +- IEEE80211_PRIVACY(wdev->conn->params.privacy)); ++ bss = cfg80211_get_conn_bss(wdev); + + if (prev_bssid) { + memcpy(wdev->conn->prev_bssid, prev_bssid, ETH_ALEN); +@@ -619,7 +608,6 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, + if (bss) { + enum nl80211_timeout_reason treason; + +- cfg80211_step_auth_next(wdev->conn, bss); + err = cfg80211_conn_do_work(wdev, &treason); + cfg80211_put_bss(wdev->wiphy, bss); + } else { +@@ -1497,15 +1485,6 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev, + } else { + if (WARN_ON(connkeys)) + return -EINVAL; +- +- /* connect can point to wdev->wext.connect which +- * can hold key data from a previous connection +- */ +- connect->key = NULL; +- connect->key_len = 0; +- connect->key_idx = 0; +- connect->crypto.cipher_group = 0; +- connect->crypto.n_ciphers_pairwise = 0; + } + + wdev->connect_keys = connkeys; diff --git a/scripts/tags.sh b/scripts/tags.sh index 0d045182c08c..8606325b0ec2 100755 --- a/scripts/tags.sh diff --git a/sources b/sources index be9324de5..4038a9314 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.3.tar.xz) = 4040ac868957608da771a5701808240899333841d0070ba0d82c69085a81c9f84aa8b8831138e99de72ccb8347e453a7acaeac73e21af04cebd4e17181caba25 -SHA512 (kernel-abi-stablelists-6.2.3.tar.bz2) = 77475eb8890c13e0e4c51e9c678006099c4d2d9a87d1444ecd5937974a4b2a4b9bae552de2e26cdfff1b06c8e0acdf4f321661daaa5a573efdb99e42b3aa27a5 -SHA512 (kernel-kabi-dw-6.2.3.tar.bz2) = b114e6a275c3b5d208f055269943308c410f2c0a7186e07daaac2cbe8a7c03980e1e8d88426e63f406ffa720dccb0c5eea7c40aed8aa42bf67edde6ccf60a7fd +SHA512 (linux-6.2.5.tar.xz) = cb9666c3038f3d28138c27e30ea37b9be49603ca99d9c88d560152f79cc78b31bba213f7c470d8b159b186228be93718c08623b11f3edffe9c2715788f352a08 +SHA512 (kernel-abi-stablelists-6.2.5.tar.bz2) = b4832eb25252c005568e82621114a2d318b969f9782a36ed9fc4a7e76c28b288bef18a60f47e7a470a6455af5c997465a4aec4ff2b0789604865ca3028c4160f +SHA512 (kernel-kabi-dw-6.2.5.tar.bz2) = 6fc4fce487a34cb7212b3605ccaebeea7d11a150e77ea0e8125792c5fd05f5646638c7f59c14a45c967a0f63f165260245171998b8e751ad84b7146bd74931cd From 4dd6d3518493ce5b4c536cd918a2491b3c268061 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 13 Mar 2023 08:47:15 -0500 Subject: [PATCH 08/87] kernel-6.2.6-300 * Mon Mar 13 2023 Justin M. Forbes [6.2.6-0] - Add Fedora 37 and 36 to release targets (Justin M. Forbes) - wifi: cfg80211: Fix use after free for wext (Alexander Wetzel) - Drop the applypatches for f37 (Justin M. Forbes) - Linux v6.2.6 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 ++ kernel.spec | 11 ++++--- patch-6.2-redhat.patch | 75 ++---------------------------------------- sources | 6 ++-- 4 files changed, 15 insertions(+), 80 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 4f89e841b..ce381b26c 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/7bc9c467e64c373fd366282769229b76379659ac + 7bc9c467e64c373fd366282769229b76379659ac wifi: cfg80211: Fix use after free for wext + "https://gitlab.com/cki-project/kernel-ark/-/commit"/d2fdc4eb94179d410f628f7f56a6740d6d7f6540 d2fdc4eb94179d410f628f7f56a6740d6d7f6540 Revert "wifi: cfg80211: Fix use after free for wext" diff --git a/kernel.spec b/kernel.spec index 346aedef2..7dd8e0204 100755 --- a/kernel.spec +++ b/kernel.spec @@ -147,17 +147,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.5 +%define specversion 6.2.6 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.5 +%define tarfile_release 6.2.6 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.5 +%define kabiversion 6.2.6 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3345,8 +3345,11 @@ fi # # %changelog -* Sat Mar 11 2023 Justin M. Forbes [6.2.5-300] +* Mon Mar 13 2023 Justin M. Forbes [6.2.6-0] +- Add Fedora 37 and 36 to release targets (Justin M. Forbes) +- wifi: cfg80211: Fix use after free for wext (Alexander Wetzel) - Drop the applypatches for f37 (Justin M. Forbes) +- Linux v6.2.6 * Sat Mar 11 2023 Justin M. Forbes [6.2.5-0] - Revert "wifi: cfg80211: Fix use after free for wext" (Justin M. Forbes) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index c3dc3eb97..54d6478ac 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -28,16 +28,15 @@ include/linux/rmi.h | 1 + include/linux/security.h | 5 + kernel/module/signing.c | 9 +- - net/wireless/sme.c | 31 +- scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 36 files changed, 985 insertions(+), 203 deletions(-) + 35 files changed, 980 insertions(+), 177 deletions(-) diff --git a/Makefile b/Makefile -index 1a1d63f2a9ed..eaa3abdb6864 100644 +index 70e66e771608..f2acee86e2e0 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1706,76 +1705,6 @@ index a2ff4242e623..f0d2be1ee4f1 100644 } int module_sig_check(struct load_info *info, int flags) -diff --git a/net/wireless/sme.c b/net/wireless/sme.c -index 4f813e346a8b..696c6ac76948 100644 ---- a/net/wireless/sme.c -+++ b/net/wireless/sme.c -@@ -285,15 +285,6 @@ void cfg80211_conn_work(struct work_struct *work) - wiphy_unlock(&rdev->wiphy); - } - --static void cfg80211_step_auth_next(struct cfg80211_conn *conn, -- struct cfg80211_bss *bss) --{ -- memcpy(conn->bssid, bss->bssid, ETH_ALEN); -- conn->params.bssid = conn->bssid; -- conn->params.channel = bss->channel; -- conn->state = CFG80211_CONN_AUTHENTICATE_NEXT; --} -- - /* Returned bss is reference counted and must be cleaned up appropriately. */ - static struct cfg80211_bss *cfg80211_get_conn_bss(struct wireless_dev *wdev) - { -@@ -311,7 +302,10 @@ static struct cfg80211_bss *cfg80211_get_conn_bss(struct wireless_dev *wdev) - if (!bss) - return NULL; - -- cfg80211_step_auth_next(wdev->conn, bss); -+ memcpy(wdev->conn->bssid, bss->bssid, ETH_ALEN); -+ wdev->conn->params.bssid = wdev->conn->bssid; -+ wdev->conn->params.channel = bss->channel; -+ wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT; - schedule_work(&rdev->conn_work); - - return bss; -@@ -603,12 +597,7 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, - wdev->conn->params.ssid_len = wdev->u.client.ssid_len; - - /* see if we have the bss already */ -- bss = cfg80211_get_bss(wdev->wiphy, wdev->conn->params.channel, -- wdev->conn->params.bssid, -- wdev->conn->params.ssid, -- wdev->conn->params.ssid_len, -- wdev->conn_bss_type, -- IEEE80211_PRIVACY(wdev->conn->params.privacy)); -+ bss = cfg80211_get_conn_bss(wdev); - - if (prev_bssid) { - memcpy(wdev->conn->prev_bssid, prev_bssid, ETH_ALEN); -@@ -619,7 +608,6 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, - if (bss) { - enum nl80211_timeout_reason treason; - -- cfg80211_step_auth_next(wdev->conn, bss); - err = cfg80211_conn_do_work(wdev, &treason); - cfg80211_put_bss(wdev->wiphy, bss); - } else { -@@ -1497,15 +1485,6 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev, - } else { - if (WARN_ON(connkeys)) - return -EINVAL; -- -- /* connect can point to wdev->wext.connect which -- * can hold key data from a previous connection -- */ -- connect->key = NULL; -- connect->key_len = 0; -- connect->key_idx = 0; -- connect->crypto.cipher_group = 0; -- connect->crypto.n_ciphers_pairwise = 0; - } - - wdev->connect_keys = connkeys; diff --git a/scripts/tags.sh b/scripts/tags.sh index 0d045182c08c..8606325b0ec2 100755 --- a/scripts/tags.sh diff --git a/sources b/sources index 4038a9314..aa8ee09df 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.5.tar.xz) = cb9666c3038f3d28138c27e30ea37b9be49603ca99d9c88d560152f79cc78b31bba213f7c470d8b159b186228be93718c08623b11f3edffe9c2715788f352a08 -SHA512 (kernel-abi-stablelists-6.2.5.tar.bz2) = b4832eb25252c005568e82621114a2d318b969f9782a36ed9fc4a7e76c28b288bef18a60f47e7a470a6455af5c997465a4aec4ff2b0789604865ca3028c4160f -SHA512 (kernel-kabi-dw-6.2.5.tar.bz2) = 6fc4fce487a34cb7212b3605ccaebeea7d11a150e77ea0e8125792c5fd05f5646638c7f59c14a45c967a0f63f165260245171998b8e751ad84b7146bd74931cd +SHA512 (linux-6.2.6.tar.xz) = 0420c3a03cc88d9becf35fa553e72e548b74a6879c8791d5f80492f510ec950066938b09c1e7c91c9628dbca24dc9ae956ae696edde30137f9e3817e409b4741 +SHA512 (kernel-abi-stablelists-6.2.6.tar.bz2) = 692cfd6e3b0013e2441de8a62feda280063bdd4c0d16202509afae5ea7b8dd93a87ef57013f75b41cbec35c304cc94fc5fe9994bb83b8bbdfcf1e5b2c6f3a8cd +SHA512 (kernel-kabi-dw-6.2.6.tar.bz2) = 05fb670b2a4c87e85712345639c133eabc1678d1de074ffac44c3bb4bc467f482441ab46a83119334afd6768d823278d1b3ea3faf9e7bfcc74b7bb6a39599373 From bfcae48dad4a951a276880e55e166c5aa7e28f37 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 17 Mar 2023 10:30:36 -0500 Subject: [PATCH 09/87] kernel-6.2.7-300 * Fri Mar 17 2023 Justin M. Forbes [6.2.7-0] - NFS: Correct timing for assigning access cache timestamp (Chengen Du) - usb: ucsi: Fix ucsi->connector race (Hans de Goede) - usb: ucsi_acpi: Increase the command completion timeout (Hans de Goede) - usb: ucsi: Fix NULL pointer deref in ucsi_connector_change() (Hans de Goede) - Enable CONFIG_NET_SCH_FQ_PIE for Fedora (Justin M. Forbes) - Fix build issue with efiuki conditional (Justin M. Forbes) - Move endif to correct location for efiuki conditional (Justin M. Forbes) - EFI UKI revert now conditionalized in spec. Drop revert (Justin M. Forbes) - Linux v6.2.7 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 12 +++ 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-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-6.2-redhat.patch | 138 +++++++++++++++++++++++- sources | 6 +- 16 files changed, 180 insertions(+), 22 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index ce381b26c..7e97c3c4a 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,15 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/14005bf69741499a3df8cb2e74c0dc99c37e9438 + 14005bf69741499a3df8cb2e74c0dc99c37e9438 NFS: Correct timing for assigning access cache timestamp + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/b7c0075f41aa13dc0ed14938e56f5d68e2956c21 + b7c0075f41aa13dc0ed14938e56f5d68e2956c21 usb: ucsi: Fix ucsi->connector race + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/4e622b7d9003916c4aa60cc08fa035b18e4f3a4e + 4e622b7d9003916c4aa60cc08fa035b18e4f3a4e usb: ucsi_acpi: Increase the command completion timeout + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/28d667bc40d7af758a6968e29f8a93be531696ab + 28d667bc40d7af758a6968e29f8a93be531696ab usb: ucsi: Fix NULL pointer deref in ucsi_connector_change() + "https://gitlab.com/cki-project/kernel-ark/-/commit"/7bc9c467e64c373fd366282769229b76379659ac 7bc9c467e64c373fd366282769229b76379659ac wifi: cfg80211: Fix use after free for wext diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index ccfdc0b3e..674b86dcc 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4809,7 +4809,7 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HHF=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index f0074ca21..f6e1cb398 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -4789,7 +4789,7 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HHF=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index a78ee57e3..60271a5b2 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -4796,7 +4796,7 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HHF=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 6397ec7e1..6110cb1a3 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -4778,7 +4778,7 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HHF=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 4afba539d..0461e9e56 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -4699,7 +4699,7 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HHF=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 0e2356467..586636723 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -4681,7 +4681,7 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HHF=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 9c49dbf8e..1c38233cf 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4035,7 +4035,7 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HHF=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 1232358f7..fbc6958f0 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4015,7 +4015,7 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HHF=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 523a05322..887aadf54 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4014,7 +4014,7 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HHF=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index b458fd563..8366a461b 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3994,7 +3994,7 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HHF=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 4baac6a75..a0ef84b0c 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4342,7 +4342,7 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HHF=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index bdc3b50f9..8ff899ac8 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4323,7 +4323,7 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_HHF=m diff --git a/kernel.spec b/kernel.spec index 7dd8e0204..6363ef2e0 100755 --- a/kernel.spec +++ b/kernel.spec @@ -107,12 +107,13 @@ Summary: The Linux kernel %endif %ifarch x86_64 -%if 0%{?fedora} > 36 %global efiuki 1 -%endif %else %global efiuki 0 %endif +%if 0%{?fedora} < 37 +%global efiuki 0 +%endif %if %{zipmodules} %global zipsed -e 's/\.ko$/\.ko.xz/' @@ -147,17 +148,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.6 +%define specversion 6.2.7 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.6 +%define tarfile_release 6.2.7 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.6 +%define kabiversion 6.2.7 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3345,6 +3346,17 @@ fi # # %changelog +* Fri Mar 17 2023 Justin M. Forbes [6.2.7-0] +- NFS: Correct timing for assigning access cache timestamp (Chengen Du) +- usb: ucsi: Fix ucsi->connector race (Hans de Goede) +- usb: ucsi_acpi: Increase the command completion timeout (Hans de Goede) +- usb: ucsi: Fix NULL pointer deref in ucsi_connector_change() (Hans de Goede) +- Enable CONFIG_NET_SCH_FQ_PIE for Fedora (Justin M. Forbes) +- Fix build issue with efiuki conditional (Justin M. Forbes) +- Move endif to correct location for efiuki conditional (Justin M. Forbes) +- EFI UKI revert now conditionalized in spec. Drop revert (Justin M. Forbes) +- Linux v6.2.7 + * Mon Mar 13 2023 Justin M. Forbes [6.2.6-0] - Add Fedora 37 and 36 to release targets (Justin M. Forbes) - wifi: cfg80211: Fix use after free for wext (Alexander Wetzel) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 54d6478ac..399e4fbf7 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -21,6 +21,9 @@ drivers/iommu/iommu.c | 22 + drivers/pci/quirks.c | 24 + drivers/usb/core/hub.c | 7 + + drivers/usb/typec/ucsi/ucsi.c | 33 +- + drivers/usb/typec/ucsi/ucsi_acpi.c | 2 +- + fs/nfs/dir.c | 2 +- include/linux/efi.h | 22 +- include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hooks.h | 6 + @@ -33,10 +36,10 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 35 files changed, 980 insertions(+), 177 deletions(-) + 38 files changed, 997 insertions(+), 197 deletions(-) diff --git a/Makefile b/Makefile -index 70e66e771608..f2acee86e2e0 100644 +index 43cf2c785cb1..f3441e6f1ed6 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1028,6 +1031,137 @@ index 97a0f8faea6e..d837548d2024 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); +diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c +index 1cf8947c6d66..086b50968983 100644 +--- a/drivers/usb/typec/ucsi/ucsi.c ++++ b/drivers/usb/typec/ucsi/ucsi.c +@@ -1039,9 +1039,8 @@ static struct fwnode_handle *ucsi_find_fwnode(struct ucsi_connector *con) + return NULL; + } + +-static int ucsi_register_port(struct ucsi *ucsi, int index) ++static int ucsi_register_port(struct ucsi *ucsi, struct ucsi_connector *con) + { +- struct ucsi_connector *con = &ucsi->connector[index]; + struct typec_capability *cap = &con->typec_cap; + enum typec_accessory *accessory = cap->accessory; + enum usb_role u_role = USB_ROLE_NONE; +@@ -1062,7 +1061,6 @@ static int ucsi_register_port(struct ucsi *ucsi, int index) + init_completion(&con->complete); + mutex_init(&con->lock); + INIT_LIST_HEAD(&con->partner_tasks); +- con->num = index + 1; + con->ucsi = ucsi; + + cap->fwnode = ucsi_find_fwnode(con); +@@ -1204,8 +1202,8 @@ static int ucsi_register_port(struct ucsi *ucsi, int index) + */ + static int ucsi_init(struct ucsi *ucsi) + { +- struct ucsi_connector *con; +- u64 command; ++ struct ucsi_connector *con, *connector; ++ u64 command, ntfy; + int ret; + int i; + +@@ -1217,8 +1215,8 @@ static int ucsi_init(struct ucsi *ucsi) + } + + /* Enable basic notifications */ +- ucsi->ntfy = UCSI_ENABLE_NTFY_CMD_COMPLETE | UCSI_ENABLE_NTFY_ERROR; +- command = UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy; ++ ntfy = UCSI_ENABLE_NTFY_CMD_COMPLETE | UCSI_ENABLE_NTFY_ERROR; ++ command = UCSI_SET_NOTIFICATION_ENABLE | ntfy; + ret = ucsi_send_command(ucsi, command, NULL, 0); + if (ret < 0) + goto err_reset; +@@ -1235,31 +1233,33 @@ static int ucsi_init(struct ucsi *ucsi) + } + + /* Allocate the connectors. Released in ucsi_unregister() */ +- ucsi->connector = kcalloc(ucsi->cap.num_connectors + 1, +- sizeof(*ucsi->connector), GFP_KERNEL); +- if (!ucsi->connector) { ++ connector = kcalloc(ucsi->cap.num_connectors + 1, sizeof(*connector), GFP_KERNEL); ++ if (!connector) { + ret = -ENOMEM; + goto err_reset; + } + + /* Register all connectors */ + for (i = 0; i < ucsi->cap.num_connectors; i++) { +- ret = ucsi_register_port(ucsi, i); ++ connector[i].num = i + 1; ++ ret = ucsi_register_port(ucsi, &connector[i]); + if (ret) + goto err_unregister; + } + + /* Enable all notifications */ +- ucsi->ntfy = UCSI_ENABLE_NTFY_ALL; +- command = UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy; ++ ntfy = UCSI_ENABLE_NTFY_ALL; ++ command = UCSI_SET_NOTIFICATION_ENABLE | ntfy; + ret = ucsi_send_command(ucsi, command, NULL, 0); + if (ret < 0) + goto err_unregister; + ++ ucsi->connector = connector; ++ ucsi->ntfy = ntfy; + return 0; + + err_unregister: +- for (con = ucsi->connector; con->port; con++) { ++ for (con = connector; con->port; con++) { + ucsi_unregister_partner(con); + ucsi_unregister_altmodes(con, UCSI_RECIPIENT_CON); + ucsi_unregister_port_psy(con); +@@ -1268,10 +1268,7 @@ static int ucsi_init(struct ucsi *ucsi) + typec_unregister_port(con->port); + con->port = NULL; + } +- +- kfree(ucsi->connector); +- ucsi->connector = NULL; +- ++ kfree(connector); + err_reset: + memset(&ucsi->cap, 0, sizeof(ucsi->cap)); + ucsi_reset_ppm(ucsi); +diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c +index ce0c8ef80c04..62206a6b8ea7 100644 +--- a/drivers/usb/typec/ucsi/ucsi_acpi.c ++++ b/drivers/usb/typec/ucsi/ucsi_acpi.c +@@ -78,7 +78,7 @@ static int ucsi_acpi_sync_write(struct ucsi *ucsi, unsigned int offset, + if (ret) + goto out_clear_bit; + +- if (!wait_for_completion_timeout(&ua->complete, HZ)) ++ if (!wait_for_completion_timeout(&ua->complete, 5 * HZ)) + ret = -ETIMEDOUT; + + out_clear_bit: +diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c +index f7e4a88d5d92..e28dd6475e39 100644 +--- a/fs/nfs/dir.c ++++ b/fs/nfs/dir.c +@@ -3089,7 +3089,6 @@ static void nfs_access_add_rbtree(struct inode *inode, + else + goto found; + } +- set->timestamp = ktime_get_ns(); + rb_link_node(&set->rb_node, parent, p); + rb_insert_color(&set->rb_node, root_node); + list_add_tail(&set->lru, &nfsi->access_cache_entry_lru); +@@ -3114,6 +3113,7 @@ void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *set, + cache->fsgid = cred->fsgid; + cache->group_info = get_group_info(cred->group_info); + cache->mask = set->mask; ++ cache->timestamp = ktime_get_ns(); + + /* The above field assignments must be visible + * before this item appears on the lru. We cannot easily diff --git a/include/linux/efi.h b/include/linux/efi.h index 98598bd1d2fa..34a6233fabaf 100644 --- a/include/linux/efi.h diff --git a/sources b/sources index aa8ee09df..53afb8db9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.6.tar.xz) = 0420c3a03cc88d9becf35fa553e72e548b74a6879c8791d5f80492f510ec950066938b09c1e7c91c9628dbca24dc9ae956ae696edde30137f9e3817e409b4741 -SHA512 (kernel-abi-stablelists-6.2.6.tar.bz2) = 692cfd6e3b0013e2441de8a62feda280063bdd4c0d16202509afae5ea7b8dd93a87ef57013f75b41cbec35c304cc94fc5fe9994bb83b8bbdfcf1e5b2c6f3a8cd -SHA512 (kernel-kabi-dw-6.2.6.tar.bz2) = 05fb670b2a4c87e85712345639c133eabc1678d1de074ffac44c3bb4bc467f482441ab46a83119334afd6768d823278d1b3ea3faf9e7bfcc74b7bb6a39599373 +SHA512 (linux-6.2.7.tar.xz) = 8772cbcf960138de2826c91a86af4bbe2bc3013f4231c7a89592e32b064181267497d05c0e4df693823b701e169fd4da89c994dcaa787581a9bcdaf491940e60 +SHA512 (kernel-abi-stablelists-6.2.7.tar.bz2) = ebbd50801a327a6dc91133ada84663aa7199ee69a4f77db97bfd2955e324661dc5846d581b470f442c55c4d830c9e80ef4123b1bbec90682a1ba9c8f086fbcff +SHA512 (kernel-kabi-dw-6.2.7.tar.bz2) = 53d2a6e44a4dda0c33b8801c2eaeb5c91ee9aa7d71dfae2ea4b3cc8673dba278f83ccdc8e88bb2aed9ebd79b1c74ff5ca2345634f31b6e06c4018d535f46a9e3 From eead23bc29def79398b33b519c9a197e97b69598 Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Wed, 22 Mar 2023 15:16:09 -0300 Subject: [PATCH 10/87] kernel-6.2.8-300 * Wed Mar 22 2023 Augusto Caringi [6.2.8-0] - Add new config option for 6.2.8 (Augusto Caringi) - Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS" (Kate Hsuan) - Linux v6.2.8 Resolves: Signed-off-by: Augusto Caringi --- Patchlist.changelog | 3 +++ kernel-ppc64le-debug-fedora.config | 2 ++ kernel-ppc64le-debug-rhel.config | 2 ++ kernel-ppc64le-fedora.config | 2 ++ kernel-ppc64le-rhel.config | 2 ++ kernel.spec | 11 ++++++++--- patch-6.2-redhat.patch | 25 +++++++++++++++++++++++-- sources | 6 +++--- 8 files changed, 45 insertions(+), 8 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 7e97c3c4a..2d5398b36 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/d72fed198ee1835d3950d0cb4787b7f3a082ff40 + d72fed198ee1835d3950d0cb4787b7f3a082ff40 Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS" + "https://gitlab.com/cki-project/kernel-ark/-/commit"/14005bf69741499a3df8cb2e74c0dc99c37e9438 14005bf69741499a3df8cb2e74c0dc99c37e9438 NFS: Correct timing for assigning access cache timestamp diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 1c38233cf..68dbeb8fa 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4708,6 +4708,7 @@ CONFIG_POWER_MLXBF=m CONFIG_POWERNV_CPUFREQ=y CONFIG_POWERNV_CPUIDLE=y # CONFIG_POWERNV_OP_PANEL is not set +# CONFIG_POWERPC64_CPU is not set # CONFIG_POWER_RESET_BRCMKONA is not set # CONFIG_POWER_RESET_BRCMSTB is not set CONFIG_POWER_RESET_GPIO_RESTART=y @@ -6824,6 +6825,7 @@ CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7877 is not set # CONFIG_TOUCHSCREEN_AD7879 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 548d73119..bc023f143 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4207,6 +4207,7 @@ CONFIG_POWER9_CPU=y CONFIG_POWERNV_CPUFREQ=y CONFIG_POWERNV_CPUIDLE=y CONFIG_POWERNV_OP_PANEL=m +# CONFIG_POWERPC64_CPU is not set # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_GPIO_RESTART is not set CONFIG_POWER_RESET_GPIO=y @@ -6190,6 +6191,7 @@ CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set CONFIG_TORTURE_TEST=m # CONFIG_TOSHIBA_HAPS is not set # CONFIG_TOSHIBA_WMI is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index fbc6958f0..7995c331e 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4687,6 +4687,7 @@ CONFIG_POWER_MLXBF=m CONFIG_POWERNV_CPUFREQ=y CONFIG_POWERNV_CPUIDLE=y # CONFIG_POWERNV_OP_PANEL is not set +# CONFIG_POWERPC64_CPU is not set # CONFIG_POWER_RESET_BRCMKONA is not set # CONFIG_POWER_RESET_BRCMSTB is not set CONFIG_POWER_RESET_GPIO_RESTART=y @@ -6801,6 +6802,7 @@ CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7877 is not set # CONFIG_TOUCHSCREEN_AD7879 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index a6993b40a..f3caaaeb7 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4186,6 +4186,7 @@ CONFIG_POWER9_CPU=y CONFIG_POWERNV_CPUFREQ=y CONFIG_POWERNV_CPUIDLE=y CONFIG_POWERNV_OP_PANEL=m +# CONFIG_POWERPC64_CPU is not set # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_GPIO_RESTART is not set CONFIG_POWER_RESET_GPIO=y @@ -6167,6 +6168,7 @@ CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set CONFIG_TORTURE_TEST=m # CONFIG_TOSHIBA_HAPS is not set # CONFIG_TOSHIBA_WMI is not set diff --git a/kernel.spec b/kernel.spec index 6363ef2e0..c5d215edc 100755 --- a/kernel.spec +++ b/kernel.spec @@ -148,17 +148,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.7 +%define specversion 6.2.8 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.7 +%define tarfile_release 6.2.8 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.7 +%define kabiversion 6.2.8 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3346,6 +3346,11 @@ fi # # %changelog +* Wed Mar 22 2023 Augusto Caringi [6.2.8-0] +- Add new config option for 6.2.8 (Augusto Caringi) +- Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS" (Kate Hsuan) +- Linux v6.2.8 + * Fri Mar 17 2023 Justin M. Forbes [6.2.7-0] - NFS: Correct timing for assigning access cache timestamp (Chengen Du) - usb: ucsi: Fix ucsi->connector race (Hans de Goede) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 399e4fbf7..2442da0ea 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -21,6 +21,7 @@ drivers/iommu/iommu.c | 22 + drivers/pci/quirks.c | 24 + drivers/usb/core/hub.c | 7 + + drivers/usb/host/xhci-pci.c | 7 +- drivers/usb/typec/ucsi/ucsi.c | 33 +- drivers/usb/typec/ucsi/ucsi_acpi.c | 2 +- fs/nfs/dir.c | 2 +- @@ -36,10 +37,10 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 38 files changed, 997 insertions(+), 197 deletions(-) + 39 files changed, 1000 insertions(+), 201 deletions(-) diff --git a/Makefile b/Makefile -index 43cf2c785cb1..f3441e6f1ed6 100644 +index 2c90d9b067f4..93b82f038789 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1031,6 +1032,26 @@ index 97a0f8faea6e..d837548d2024 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); +diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c +index fb988e4ea924..6db07ca419c3 100644 +--- a/drivers/usb/host/xhci-pci.c ++++ b/drivers/usb/host/xhci-pci.c +@@ -771,12 +771,11 @@ static struct pci_driver xhci_pci_driver = { + /* suspend and resume implemented later */ + + .shutdown = usb_hcd_pci_shutdown, +- .driver = { + #ifdef CONFIG_PM +- .pm = &usb_hcd_pci_pm_ops, +-#endif +- .probe_type = PROBE_PREFER_ASYNCHRONOUS, ++ .driver = { ++ .pm = &usb_hcd_pci_pm_ops + }, ++#endif + }; + + static int __init xhci_pci_init(void) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 1cf8947c6d66..086b50968983 100644 --- a/drivers/usb/typec/ucsi/ucsi.c diff --git a/sources b/sources index 53afb8db9..38e7f715c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.7.tar.xz) = 8772cbcf960138de2826c91a86af4bbe2bc3013f4231c7a89592e32b064181267497d05c0e4df693823b701e169fd4da89c994dcaa787581a9bcdaf491940e60 -SHA512 (kernel-abi-stablelists-6.2.7.tar.bz2) = ebbd50801a327a6dc91133ada84663aa7199ee69a4f77db97bfd2955e324661dc5846d581b470f442c55c4d830c9e80ef4123b1bbec90682a1ba9c8f086fbcff -SHA512 (kernel-kabi-dw-6.2.7.tar.bz2) = 53d2a6e44a4dda0c33b8801c2eaeb5c91ee9aa7d71dfae2ea4b3cc8673dba278f83ccdc8e88bb2aed9ebd79b1c74ff5ca2345634f31b6e06c4018d535f46a9e3 +SHA512 (linux-6.2.8.tar.xz) = 7e7ab30dc4977f60cd97bfc035f99ce6d67ec1f5636c68b7239955e67b7b4681b3aed76a62258988cb2c87f7a3a4ca9d80f38dd86a9451f3a8a4b62dee418a23 +SHA512 (kernel-abi-stablelists-6.2.8.tar.bz2) = 4e5efb2e23401f5a96c8cdedeb8c1bcef89f1b17dc159878429bd9ee279cfc34c29aa20eda7fb90b3a8acd6521d67f5e9c4028abd7e69d518815634b0f9bd9aa +SHA512 (kernel-kabi-dw-6.2.8.tar.bz2) = 9c8f60cd5085ae4f0f804db31349e850e730614748f3177c0550bc9877b15cf4de11ad684414ff23071931dcd40fefe4b33f7425c619c6362c877bd56fb4788e From c7daa76da73d0047cf84e443bec6cd80abab8a3f Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Thu, 30 Mar 2023 18:55:36 -0300 Subject: [PATCH 11/87] kernel-6.2.9-300 * Thu Mar 30 2023 Augusto Caringi [6.2.9-0] - Add bug numbers from recent MRs (Justin M. Forbes) - net: wwan: iosm: fixes 7560 modem crash (M Chetan Kumar) - Input: alps - fix compatibility with -funsigned-char (msizanoen) - Input: focaltech - use explicitly signed char type (Jason A. Donenfeld) - drm/nouveau/kms: Fix backlight registration (Hans de Goede) - Add bugs addressed so far for the 6.2.9 build (Justin M. Forbes) - btrfs: fix race between quota disable and quota assign ioctls (Filipe Manana) - redhat/configs: Enable CONFIG_SND_SOC_CS42L83 (Neal Gompa) - Add patch to turn off EFI_ZBOOT for Fedora 36 (Justin M. Forbes) - Linux v6.2.9 Resolves: Signed-off-by: Augusto Caringi --- Patchlist.changelog | 15 ++ 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-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 | 18 +- patch-6.2-redhat.patch | 255 +++++++++++++++++------- sources | 6 +- 16 files changed, 230 insertions(+), 88 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 2d5398b36..53079bcc3 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,18 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/b07be483040ffde4aea1f4979bf5aba52898e736 + b07be483040ffde4aea1f4979bf5aba52898e736 net: wwan: iosm: fixes 7560 modem crash + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/84ec9dc84621513d0d1696c0535ea1e305181c2a + 84ec9dc84621513d0d1696c0535ea1e305181c2a Input: alps - fix compatibility with -funsigned-char + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/e4823b9e65e36058a10a875e053ee550861c860a + e4823b9e65e36058a10a875e053ee550861c860a Input: focaltech - use explicitly signed char type + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/97e494ffa8f7e65e75c0631f1a5bf3ac70a96e99 + 97e494ffa8f7e65e75c0631f1a5bf3ac70a96e99 drm/nouveau/kms: Fix backlight registration + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/78eac5b28b5a43c7a99b65798af08c0fba4a62aa + 78eac5b28b5a43c7a99b65798af08c0fba4a62aa btrfs: fix race between quota disable and quota assign ioctls + "https://gitlab.com/cki-project/kernel-ark/-/commit"/d72fed198ee1835d3950d0cb4787b7f3a082ff40 d72fed198ee1835d3950d0cb4787b7f3a082ff40 Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS" diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 674b86dcc..d44e94deb 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -7239,7 +7239,7 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42L83 is not set +CONFIG_SND_SOC_CS42L83=m CONFIG_SND_SOC_CS42XX8_I2C=m CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index f6e1cb398..c168533b2 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -7217,7 +7217,7 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42L83 is not set +CONFIG_SND_SOC_CS42L83=m CONFIG_SND_SOC_CS42XX8_I2C=m CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 60271a5b2..044c61663 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -7243,7 +7243,7 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42L83 is not set +CONFIG_SND_SOC_CS42L83=m CONFIG_SND_SOC_CS42XX8_I2C=m CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 6110cb1a3..c02ae54c2 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -7223,7 +7223,7 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42L83 is not set +CONFIG_SND_SOC_CS42L83=m CONFIG_SND_SOC_CS42XX8_I2C=m CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 0461e9e56..91a6aee41 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -7053,7 +7053,7 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42L83 is not set +CONFIG_SND_SOC_CS42L83=m CONFIG_SND_SOC_CS42XX8_I2C=m CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 586636723..c0bcb6036 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -7033,7 +7033,7 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42L83 is not set +CONFIG_SND_SOC_CS42L83=m CONFIG_SND_SOC_CS42XX8_I2C=m CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 68dbeb8fa..5f38b2456 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -6065,7 +6065,7 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42L83 is not set +CONFIG_SND_SOC_CS42L83=m # CONFIG_SND_SOC_CS42XX8_I2C is not set CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 7995c331e..f591158be 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -6043,7 +6043,7 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42L83 is not set +CONFIG_SND_SOC_CS42L83=m # CONFIG_SND_SOC_CS42XX8_I2C is not set CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 887aadf54..b0f9cffaa 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -6005,7 +6005,7 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42L83 is not set +CONFIG_SND_SOC_CS42L83=m # CONFIG_SND_SOC_CS42XX8_I2C is not set CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 8366a461b..acfd326be 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5983,7 +5983,7 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42L83 is not set +CONFIG_SND_SOC_CS42L83=m # CONFIG_SND_SOC_CS42XX8_I2C is not set CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index a0ef84b0c..f3b8e2390 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6437,7 +6437,7 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42L83 is not set +CONFIG_SND_SOC_CS42L83=m # CONFIG_SND_SOC_CS42XX8_I2C is not set CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 8ff899ac8..55b929ab0 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6416,7 +6416,7 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set -# CONFIG_SND_SOC_CS42L83 is not set +CONFIG_SND_SOC_CS42L83=m # CONFIG_SND_SOC_CS42XX8_I2C is not set CONFIG_SND_SOC_CS43130=m # CONFIG_SND_SOC_CS4341 is not set diff --git a/kernel.spec b/kernel.spec index c5d215edc..cb7d50ac1 100755 --- a/kernel.spec +++ b/kernel.spec @@ -148,17 +148,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.8 +%define specversion 6.2.9 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.8 +%define tarfile_release 6.2.9 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.8 +%define kabiversion 6.2.9 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3346,6 +3346,18 @@ fi # # %changelog +* Thu Mar 30 2023 Augusto Caringi [6.2.9-0] +- Add bug numbers from recent MRs (Justin M. Forbes) +- net: wwan: iosm: fixes 7560 modem crash (M Chetan Kumar) +- Input: alps - fix compatibility with -funsigned-char (msizanoen) +- Input: focaltech - use explicitly signed char type (Jason A. Donenfeld) +- drm/nouveau/kms: Fix backlight registration (Hans de Goede) +- Add bugs addressed so far for the 6.2.9 build (Justin M. Forbes) +- btrfs: fix race between quota disable and quota assign ioctls (Filipe Manana) +- redhat/configs: Enable CONFIG_SND_SOC_CS42L83 (Neal Gompa) +- Add patch to turn off EFI_ZBOOT for Fedora 36 (Justin M. Forbes) +- Linux v6.2.9 + * Wed Mar 22 2023 Augusto Caringi [6.2.8-0] - Add new config option for 6.2.8 (Augusto Caringi) - Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS" (Kate Hsuan) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 2442da0ea..057891447 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -15,16 +15,20 @@ drivers/firmware/efi/efi.c | 124 +++-- drivers/firmware/efi/secureboot.c | 38 ++ drivers/firmware/sysfb.c | 18 +- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 7 +- drivers/hid/hid-rmi.c | 66 --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 + + drivers/input/mouse/alps.c | 16 +- + drivers/input/mouse/focaltech.c | 8 +- drivers/input/rmi4/rmi_driver.c | 124 +++-- drivers/iommu/iommu.c | 22 + + drivers/net/wwan/iosm/iosm_ipc_imem.c | 7 + drivers/pci/quirks.c | 24 + drivers/usb/core/hub.c | 7 + drivers/usb/host/xhci-pci.c | 7 +- - drivers/usb/typec/ucsi/ucsi.c | 33 +- - drivers/usb/typec/ucsi/ucsi_acpi.c | 2 +- - fs/nfs/dir.c | 2 +- + drivers/usb/typec/ucsi/ucsi.c | 22 +- + fs/btrfs/ioctl.c | 2 + + fs/btrfs/qgroup.c | 11 +- include/linux/efi.h | 22 +- include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hooks.h | 6 + @@ -37,10 +41,10 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 39 files changed, 1000 insertions(+), 201 deletions(-) + 43 files changed, 1029 insertions(+), 208 deletions(-) diff --git a/Makefile b/Makefile -index 2c90d9b067f4..93b82f038789 100644 +index 8732f7208d59..2ef18d9eed77 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -559,7 +563,7 @@ index 000000000000..de0a3714a5d4 + } +} diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c -index 3fd3563d962b..75d67e6dde2a 100644 +index 3c197db42c9d..16e4a2e90fae 100644 --- a/drivers/firmware/sysfb.c +++ b/drivers/firmware/sysfb.c @@ -34,6 +34,22 @@ @@ -585,7 +589,7 @@ index 3fd3563d962b..75d67e6dde2a 100644 static struct platform_device *pd; static DEFINE_MUTEX(disable_lock); static bool disabled; -@@ -83,7 +99,7 @@ static __init int sysfb_init(void) +@@ -85,7 +101,7 @@ static __init int sysfb_init(void) /* try to create a simple-framebuffer device */ compatible = sysfb_parse_mode(si, &mode); @@ -594,6 +598,32 @@ index 3fd3563d962b..75d67e6dde2a 100644 pd = sysfb_create_simplefb(si, &mode); if (!IS_ERR(pd)) goto unlock_mutex; +diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c +index 40409a29f5b6..91b5ecc57538 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c ++++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include "nouveau_drv.h" + #include "nouveau_reg.h" +@@ -299,8 +300,12 @@ 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; + ++ /* ++ * Note when this runs the connectors have not been probed yet, ++ * so nv_conn->base.status is not set yet. ++ */ + if (!nvif_rd32(device, NV50_PDISP_SOR_PWM_CTL(ffs(nv_encoder->dcb->or) - 1)) || +- nv_conn->base.status != connector_status_connected) ++ drm_helper_probe_detect(&nv_conn->base, NULL, false) != 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 84e7ba5314d3..efc96776f761 100644 --- a/drivers/hid/hid-rmi.c @@ -747,6 +777,83 @@ index 77bca6932f01..27f5455aef6c 100644 amba_driver_unregister(&etm4x_amba_driver); platform_driver_unregister(&etm4_platform_driver); etm4_pm_clear(); +diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c +index 989228b5a0a4..e2c11d9f3868 100644 +--- a/drivers/input/mouse/alps.c ++++ b/drivers/input/mouse/alps.c +@@ -852,8 +852,8 @@ static void alps_process_packet_v6(struct psmouse *psmouse) + x = y = z = 0; + + /* Divide 4 since trackpoint's speed is too fast */ +- input_report_rel(dev2, REL_X, (char)x / 4); +- input_report_rel(dev2, REL_Y, -((char)y / 4)); ++ input_report_rel(dev2, REL_X, (s8)x / 4); ++ input_report_rel(dev2, REL_Y, -((s8)y / 4)); + + psmouse_report_standard_buttons(dev2, packet[3]); + +@@ -1104,8 +1104,8 @@ static void alps_process_trackstick_packet_v7(struct psmouse *psmouse) + ((packet[3] & 0x20) << 1); + z = (packet[5] & 0x3f) | ((packet[3] & 0x80) >> 1); + +- input_report_rel(dev2, REL_X, (char)x); +- input_report_rel(dev2, REL_Y, -((char)y)); ++ input_report_rel(dev2, REL_X, (s8)x); ++ input_report_rel(dev2, REL_Y, -((s8)y)); + input_report_abs(dev2, ABS_PRESSURE, z); + + psmouse_report_standard_buttons(dev2, packet[1]); +@@ -2294,20 +2294,20 @@ static int alps_get_v3_v7_resolution(struct psmouse *psmouse, int reg_pitch) + if (reg < 0) + return reg; + +- x_pitch = (char)(reg << 4) >> 4; /* sign extend lower 4 bits */ ++ x_pitch = (s8)(reg << 4) >> 4; /* sign extend lower 4 bits */ + x_pitch = 50 + 2 * x_pitch; /* In 0.1 mm units */ + +- y_pitch = (char)reg >> 4; /* sign extend upper 4 bits */ ++ y_pitch = (s8)reg >> 4; /* sign extend upper 4 bits */ + y_pitch = 36 + 2 * y_pitch; /* In 0.1 mm units */ + + reg = alps_command_mode_read_reg(psmouse, reg_pitch + 1); + if (reg < 0) + return reg; + +- x_electrode = (char)(reg << 4) >> 4; /* sign extend lower 4 bits */ ++ x_electrode = (s8)(reg << 4) >> 4; /* sign extend lower 4 bits */ + x_electrode = 17 + x_electrode; + +- y_electrode = (char)reg >> 4; /* sign extend upper 4 bits */ ++ y_electrode = (s8)reg >> 4; /* sign extend upper 4 bits */ + y_electrode = 13 + y_electrode; + + x_phys = x_pitch * (x_electrode - 1); /* In 0.1 mm units */ +diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c +index 6fd5fff0cbff..c74b99077d16 100644 +--- a/drivers/input/mouse/focaltech.c ++++ b/drivers/input/mouse/focaltech.c +@@ -202,8 +202,8 @@ static void focaltech_process_rel_packet(struct psmouse *psmouse, + state->pressed = packet[0] >> 7; + finger1 = ((packet[0] >> 4) & 0x7) - 1; + if (finger1 < FOC_MAX_FINGERS) { +- state->fingers[finger1].x += (char)packet[1]; +- state->fingers[finger1].y += (char)packet[2]; ++ state->fingers[finger1].x += (s8)packet[1]; ++ state->fingers[finger1].y += (s8)packet[2]; + } else { + psmouse_err(psmouse, "First finger in rel packet invalid: %d\n", + finger1); +@@ -218,8 +218,8 @@ static void focaltech_process_rel_packet(struct psmouse *psmouse, + */ + finger2 = ((packet[3] >> 4) & 0x7) - 1; + if (finger2 < FOC_MAX_FINGERS) { +- state->fingers[finger2].x += (char)packet[4]; +- state->fingers[finger2].y += (char)packet[5]; ++ state->fingers[finger2].x += (s8)packet[4]; ++ state->fingers[finger2].y += (s8)packet[5]; + } + } + diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index 258d5fe3d395..f7298e3dc8f3 100644 --- a/drivers/input/rmi4/rmi_driver.c @@ -979,6 +1086,24 @@ index f8100067502f..e0823c45e2fa 100644 /* * Changes the default domain of an iommu group that has *only* one device * +diff --git a/drivers/net/wwan/iosm/iosm_ipc_imem.c b/drivers/net/wwan/iosm/iosm_ipc_imem.c +index 1e6a47976642..c066b0040a3f 100644 +--- a/drivers/net/wwan/iosm/iosm_ipc_imem.c ++++ b/drivers/net/wwan/iosm/iosm_ipc_imem.c +@@ -587,6 +587,13 @@ static void ipc_imem_run_state_worker(struct work_struct *instance) + while (ctrl_chl_idx < IPC_MEM_MAX_CHANNELS) { + if (!ipc_chnl_cfg_get(&chnl_cfg_port, ctrl_chl_idx)) { + ipc_imem->ipc_port[ctrl_chl_idx] = NULL; ++ ++ if (ipc_imem->pcie->pci->device == INTEL_CP_DEVICE_7560_ID && ++ chnl_cfg_port.wwan_port_type == WWAN_PORT_XMMRPC) { ++ ctrl_chl_idx++; ++ continue; ++ } ++ + if (ipc_imem->pcie->pci->device == INTEL_CP_DEVICE_7360_ID && + chnl_cfg_port.wwan_port_type == WWAN_PORT_MBIM) { + ctrl_chl_idx++; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 494fa46f5767..27bc8dd45ad8 100644 --- a/drivers/pci/quirks.c @@ -1053,7 +1178,7 @@ index fb988e4ea924..6db07ca419c3 100644 static int __init xhci_pci_init(void) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c -index 1cf8947c6d66..086b50968983 100644 +index 8cbbb002fefe..086b50968983 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -1039,9 +1039,8 @@ static struct fwnode_handle *ucsi_find_fwnode(struct ucsi_connector *con) @@ -1075,29 +1200,16 @@ index 1cf8947c6d66..086b50968983 100644 con->ucsi = ucsi; cap->fwnode = ucsi_find_fwnode(con); -@@ -1204,8 +1202,8 @@ static int ucsi_register_port(struct ucsi *ucsi, int index) +@@ -1204,7 +1202,7 @@ static int ucsi_register_port(struct ucsi *ucsi, int index) */ static int ucsi_init(struct ucsi *ucsi) { - struct ucsi_connector *con; -- u64 command; + struct ucsi_connector *con, *connector; -+ u64 command, ntfy; + u64 command, ntfy; int ret; int i; - -@@ -1217,8 +1215,8 @@ static int ucsi_init(struct ucsi *ucsi) - } - - /* Enable basic notifications */ -- ucsi->ntfy = UCSI_ENABLE_NTFY_CMD_COMPLETE | UCSI_ENABLE_NTFY_ERROR; -- command = UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy; -+ ntfy = UCSI_ENABLE_NTFY_CMD_COMPLETE | UCSI_ENABLE_NTFY_ERROR; -+ command = UCSI_SET_NOTIFICATION_ENABLE | ntfy; - ret = ucsi_send_command(ucsi, command, NULL, 0); - if (ret < 0) - goto err_reset; -@@ -1235,31 +1233,33 @@ static int ucsi_init(struct ucsi *ucsi) +@@ -1235,16 +1233,16 @@ static int ucsi_init(struct ucsi *ucsi) } /* Allocate the connectors. Released in ucsi_unregister() */ @@ -1118,18 +1230,12 @@ index 1cf8947c6d66..086b50968983 100644 if (ret) goto err_unregister; } - - /* Enable all notifications */ -- ucsi->ntfy = UCSI_ENABLE_NTFY_ALL; -- command = UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy; -+ ntfy = UCSI_ENABLE_NTFY_ALL; -+ command = UCSI_SET_NOTIFICATION_ENABLE | ntfy; - ret = ucsi_send_command(ucsi, command, NULL, 0); +@@ -1256,11 +1254,12 @@ static int ucsi_init(struct ucsi *ucsi) if (ret < 0) goto err_unregister; + ucsi->connector = connector; -+ ucsi->ntfy = ntfy; + ucsi->ntfy = ntfy; return 0; err_unregister: @@ -1138,7 +1244,7 @@ index 1cf8947c6d66..086b50968983 100644 ucsi_unregister_partner(con); ucsi_unregister_altmodes(con, UCSI_RECIPIENT_CON); ucsi_unregister_port_psy(con); -@@ -1268,10 +1268,7 @@ static int ucsi_init(struct ucsi *ucsi) +@@ -1269,10 +1268,7 @@ static int ucsi_init(struct ucsi *ucsi) typec_unregister_port(con->port); con->port = NULL; } @@ -1150,41 +1256,50 @@ index 1cf8947c6d66..086b50968983 100644 err_reset: memset(&ucsi->cap, 0, sizeof(ucsi->cap)); ucsi_reset_ppm(ucsi); -diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c -index ce0c8ef80c04..62206a6b8ea7 100644 ---- a/drivers/usb/typec/ucsi/ucsi_acpi.c -+++ b/drivers/usb/typec/ucsi/ucsi_acpi.c -@@ -78,7 +78,7 @@ static int ucsi_acpi_sync_write(struct ucsi *ucsi, unsigned int offset, - if (ret) - goto out_clear_bit; - -- if (!wait_for_completion_timeout(&ua->complete, HZ)) -+ if (!wait_for_completion_timeout(&ua->complete, 5 * HZ)) - ret = -ETIMEDOUT; - - out_clear_bit: -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c -index f7e4a88d5d92..e28dd6475e39 100644 ---- a/fs/nfs/dir.c -+++ b/fs/nfs/dir.c -@@ -3089,7 +3089,6 @@ static void nfs_access_add_rbtree(struct inode *inode, - else - goto found; +diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c +index 7e348bd2ccde..c232636ecdfe 100644 +--- a/fs/btrfs/ioctl.c ++++ b/fs/btrfs/ioctl.c +@@ -3731,7 +3731,9 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg) } -- set->timestamp = ktime_get_ns(); - rb_link_node(&set->rb_node, parent, p); - rb_insert_color(&set->rb_node, root_node); - list_add_tail(&set->lru, &nfsi->access_cache_entry_lru); -@@ -3114,6 +3113,7 @@ void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *set, - cache->fsgid = cred->fsgid; - cache->group_info = get_group_info(cred->group_info); - cache->mask = set->mask; -+ cache->timestamp = ktime_get_ns(); - /* The above field assignments must be visible - * before this item appears on the lru. We cannot easily + /* update qgroup status and info */ ++ mutex_lock(&fs_info->qgroup_ioctl_lock); + err = btrfs_run_qgroups(trans); ++ mutex_unlock(&fs_info->qgroup_ioctl_lock); + if (err < 0) + btrfs_handle_fs_error(fs_info, err, + "failed to update qgroup status and info"); +diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c +index af97413abcf4..abf2b7f14307 100644 +--- a/fs/btrfs/qgroup.c ++++ b/fs/btrfs/qgroup.c +@@ -2828,13 +2828,22 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans) + } + + /* +- * called from commit_transaction. Writes all changed qgroups to disk. ++ * Writes all changed qgroups to disk. ++ * Called by the transaction commit path and the qgroup assign ioctl. + */ + int btrfs_run_qgroups(struct btrfs_trans_handle *trans) + { + struct btrfs_fs_info *fs_info = trans->fs_info; + int ret = 0; + ++ /* ++ * In case we are called from the qgroup assign ioctl, assert that we ++ * are holding the qgroup_ioctl_lock, otherwise we can race with a quota ++ * disable operation (ioctl) and access a freed quota root. ++ */ ++ if (trans->transaction->state != TRANS_STATE_COMMIT_DOING) ++ lockdep_assert_held(&fs_info->qgroup_ioctl_lock); ++ + if (!fs_info->quota_root) + return ret; + diff --git a/include/linux/efi.h b/include/linux/efi.h -index 98598bd1d2fa..34a6233fabaf 100644 +index ac22f7ca195a..e680835ad387 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -43,6 +43,8 @@ @@ -1196,7 +1311,7 @@ index 98598bd1d2fa..34a6233fabaf 100644 typedef unsigned long efi_status_t; typedef u8 efi_bool_t; typedef u16 efi_char16_t; /* UNICODE character */ -@@ -851,6 +853,14 @@ extern int __init efi_setup_pcdp_console(char *); +@@ -852,6 +854,14 @@ extern int __init efi_setup_pcdp_console(char *); #define EFI_MEM_ATTR 10 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */ #define EFI_MEM_NO_SOFT_RESERVE 11 /* Is the kernel configured to ignore soft reservations? */ #define EFI_PRESERVE_BS_REGIONS 12 /* Are EFI boot-services memory segments available? */ @@ -1211,7 +1326,7 @@ index 98598bd1d2fa..34a6233fabaf 100644 #ifdef CONFIG_EFI /* -@@ -862,6 +872,8 @@ static inline bool efi_enabled(int feature) +@@ -863,6 +873,8 @@ static inline bool efi_enabled(int feature) } extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused); @@ -1220,7 +1335,7 @@ index 98598bd1d2fa..34a6233fabaf 100644 bool __pure __efi_soft_reserve_enabled(void); static inline bool __pure efi_soft_reserve_enabled(void) -@@ -883,6 +895,8 @@ static inline bool efi_enabled(int feature) +@@ -884,6 +896,8 @@ static inline bool efi_enabled(int feature) static inline void efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {} @@ -1229,7 +1344,7 @@ index 98598bd1d2fa..34a6233fabaf 100644 static inline bool efi_soft_reserve_enabled(void) { return false; -@@ -897,6 +911,7 @@ static inline void efi_find_mirror(void) {} +@@ -898,6 +912,7 @@ static inline void efi_find_mirror(void) {} #endif extern int efi_status_to_err(efi_status_t status); @@ -1237,7 +1352,7 @@ index 98598bd1d2fa..34a6233fabaf 100644 /* * Variable Attributes -@@ -1099,13 +1114,6 @@ static inline bool efi_runtime_disabled(void) { return true; } +@@ -1100,13 +1115,6 @@ static inline bool efi_runtime_disabled(void) { return true; } extern void efi_call_virt_check_flags(unsigned long flags, const char *call); extern unsigned long efi_call_virt_save_flags(void); diff --git a/sources b/sources index 38e7f715c..e765d0f72 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.8.tar.xz) = 7e7ab30dc4977f60cd97bfc035f99ce6d67ec1f5636c68b7239955e67b7b4681b3aed76a62258988cb2c87f7a3a4ca9d80f38dd86a9451f3a8a4b62dee418a23 -SHA512 (kernel-abi-stablelists-6.2.8.tar.bz2) = 4e5efb2e23401f5a96c8cdedeb8c1bcef89f1b17dc159878429bd9ee279cfc34c29aa20eda7fb90b3a8acd6521d67f5e9c4028abd7e69d518815634b0f9bd9aa -SHA512 (kernel-kabi-dw-6.2.8.tar.bz2) = 9c8f60cd5085ae4f0f804db31349e850e730614748f3177c0550bc9877b15cf4de11ad684414ff23071931dcd40fefe4b33f7425c619c6362c877bd56fb4788e +SHA512 (linux-6.2.9.tar.xz) = 826a125b2a8b6739e55ac739f2f3a909f016a6c512e84e9f4928aca40ba66ae2dd8711e6fe4e3f09809e4a7bd1717eca90fa87585c67a21704d9aa9ffc02f0ed +SHA512 (kernel-abi-stablelists-6.2.9.tar.bz2) = 3f14e56f382c468656415729ec563333998ca3581110e2c64fe482b6718f6d8bbd8a06e44910bcb1dd4a24cf98c05d62b1d01b088b510e095c5e766dd15c8864 +SHA512 (kernel-kabi-dw-6.2.9.tar.bz2) = 470efb441d4bb6688422ff20cf8ae2bc8d9bbc40bfd32a0fc1aa24f37ae71fc249e281142ce2c83b2330d067b15aa17e20153310ee0505a86c37ad2bf638367a From e8485a1a6956b58f15da0efc34f140413edb60c1 Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Thu, 6 Apr 2023 19:45:19 -0300 Subject: [PATCH 12/87] kernel-6.2.10-300 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Thu Apr 06 2023 Augusto Caringi [6.2.10-0] - fedora: arm: Enable DRM_PANEL_HIMAX_HX8394 (Peter Robinson) - arm64: dts: rk3399-pinephone-pro: Add touchscreen support (Martijn Braam) - arm64: dts: rk3399-pinephone-pro: Add internal display support (Martijn Braam) - drm: panel: Add Himax HX8394 panel controller driver (Kamil Trzciński) - dt-bindings: display: Add Himax HX8394 panel controller (Javier Martinez Canillas) - Fix up revert patch for F36 zboot (Justin M. Forbes) - Linux v6.2.10 Resolves: Signed-off-by: Augusto Caringi --- Patchlist.changelog | 12 + kernel-aarch64-debug-fedora.config | 1 + kernel-aarch64-fedora.config | 1 + kernel-armv7hl-debug-fedora.config | 1 + kernel-armv7hl-fedora.config | 1 + kernel-armv7hl-lpae-debug-fedora.config | 1 + kernel-armv7hl-lpae-fedora.config | 1 + kernel-ppc64le-debug-fedora.config | 1 + kernel-ppc64le-fedora.config | 1 + kernel-s390x-debug-fedora.config | 1 + kernel-s390x-fedora.config | 1 + kernel-x86_64-debug-fedora.config | 1 + kernel-x86_64-fedora.config | 1 + kernel.spec | 15 +- patch-6.2-redhat.patch | 994 ++++++++++++++++++------ sources | 6 +- 16 files changed, 783 insertions(+), 256 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 53079bcc3..bf8c6056a 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,15 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/efa74f28ec858cb955be08faf1086f05c3f7510a + efa74f28ec858cb955be08faf1086f05c3f7510a arm64: dts: rk3399-pinephone-pro: Add touchscreen support + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/a9e7700a801771e102607a569ff6864e22fd057d + a9e7700a801771e102607a569ff6864e22fd057d arm64: dts: rk3399-pinephone-pro: Add internal display support + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/bcbae486933e1967e9cc24d510cda81f064993cc + bcbae486933e1967e9cc24d510cda81f064993cc drm: panel: Add Himax HX8394 panel controller driver + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/9d6a7048fd29c3ac5ae50b83620dcc5959490118 + 9d6a7048fd29c3ac5ae50b83620dcc5959490118 dt-bindings: display: Add Himax HX8394 panel controller + "https://gitlab.com/cki-project/kernel-ark/-/commit"/b07be483040ffde4aea1f4979bf5aba52898e736 b07be483040ffde4aea1f4979bf5aba52898e736 net: wwan: iosm: fixes 7560 modem crash diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index d44e94deb..62b4f3e60 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1906,6 +1906,7 @@ CONFIG_DRM_PANEL_EDP=m CONFIG_DRM_PANEL_ELIDA_KD35T133=m CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +CONFIG_DRM_PANEL_HIMAX_HX8394=m CONFIG_DRM_PANEL_ILITEK_IL9322=m CONFIG_DRM_PANEL_ILITEK_ILI9341=m CONFIG_DRM_PANEL_ILITEK_ILI9881C=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index c168533b2..da50f9d46 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1898,6 +1898,7 @@ CONFIG_DRM_PANEL_EDP=m CONFIG_DRM_PANEL_ELIDA_KD35T133=m CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +CONFIG_DRM_PANEL_HIMAX_HX8394=m CONFIG_DRM_PANEL_ILITEK_IL9322=m CONFIG_DRM_PANEL_ILITEK_ILI9341=m CONFIG_DRM_PANEL_ILITEK_ILI9881C=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 044c61663..e0007c6ea 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1889,6 +1889,7 @@ CONFIG_DRM_PANEL_EDP=m CONFIG_DRM_PANEL_ELIDA_KD35T133=m CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +CONFIG_DRM_PANEL_HIMAX_HX8394=m CONFIG_DRM_PANEL_ILITEK_IL9322=m CONFIG_DRM_PANEL_ILITEK_ILI9341=m CONFIG_DRM_PANEL_ILITEK_ILI9881C=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index c02ae54c2..8207c0eac 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1882,6 +1882,7 @@ CONFIG_DRM_PANEL_EDP=m CONFIG_DRM_PANEL_ELIDA_KD35T133=m CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +CONFIG_DRM_PANEL_HIMAX_HX8394=m CONFIG_DRM_PANEL_ILITEK_IL9322=m CONFIG_DRM_PANEL_ILITEK_ILI9341=m CONFIG_DRM_PANEL_ILITEK_ILI9881C=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 91a6aee41..c3917cbda 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1846,6 +1846,7 @@ CONFIG_DRM_PANEL_EDP=m CONFIG_DRM_PANEL_ELIDA_KD35T133=m CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +CONFIG_DRM_PANEL_HIMAX_HX8394=m CONFIG_DRM_PANEL_ILITEK_IL9322=m CONFIG_DRM_PANEL_ILITEK_ILI9341=m CONFIG_DRM_PANEL_ILITEK_ILI9881C=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index c0bcb6036..ec6fe413d 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1839,6 +1839,7 @@ CONFIG_DRM_PANEL_EDP=m CONFIG_DRM_PANEL_ELIDA_KD35T133=m CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +CONFIG_DRM_PANEL_HIMAX_HX8394=m CONFIG_DRM_PANEL_ILITEK_IL9322=m CONFIG_DRM_PANEL_ILITEK_ILI9341=m CONFIG_DRM_PANEL_ILITEK_ILI9881C=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 5f38b2456..5a3fe4152 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1445,6 +1445,7 @@ CONFIG_DRM_PANEL_DSI_CM=m CONFIG_DRM_PANEL_ELIDA_KD35T133=m CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +# CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f591158be..e4d078556 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1436,6 +1436,7 @@ CONFIG_DRM_PANEL_DSI_CM=m CONFIG_DRM_PANEL_ELIDA_KD35T133=m CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +# CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index b0f9cffaa..ff5b76e5c 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1451,6 +1451,7 @@ CONFIG_DRM_PANEL_DSI_CM=m CONFIG_DRM_PANEL_ELIDA_KD35T133=m CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +# CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index acfd326be..7c4f9fdfa 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1442,6 +1442,7 @@ CONFIG_DRM_PANEL_DSI_CM=m CONFIG_DRM_PANEL_ELIDA_KD35T133=m CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +# CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index f3b8e2390..6a5c5dbdd 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1576,6 +1576,7 @@ CONFIG_DRM_PANEL_DSI_CM=m CONFIG_DRM_PANEL_ELIDA_KD35T133=m CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +# CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 55b929ab0..067cab59e 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1567,6 +1567,7 @@ CONFIG_DRM_PANEL_DSI_CM=m CONFIG_DRM_PANEL_ELIDA_KD35T133=m CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +# CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set diff --git a/kernel.spec b/kernel.spec index cb7d50ac1..e144e181c 100755 --- a/kernel.spec +++ b/kernel.spec @@ -148,17 +148,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.9 +%define specversion 6.2.10 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.9 +%define tarfile_release 6.2.10 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.9 +%define kabiversion 6.2.10 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3346,6 +3346,15 @@ fi # # %changelog +* Thu Apr 06 2023 Augusto Caringi [6.2.10-0] +- fedora: arm: Enable DRM_PANEL_HIMAX_HX8394 (Peter Robinson) +- arm64: dts: rk3399-pinephone-pro: Add touchscreen support (Martijn Braam) +- arm64: dts: rk3399-pinephone-pro: Add internal display support (Martijn Braam) +- drm: panel: Add Himax HX8394 panel controller driver (Kamil Trzciński) +- dt-bindings: display: Add Himax HX8394 panel controller (Javier Martinez Canillas) +- Fix up revert patch for F36 zboot (Justin M. Forbes) +- Linux v6.2.10 + * Thu Mar 30 2023 Augusto Caringi [6.2.9-0] - Add bug numbers from recent MRs (Justin M. Forbes) - net: wwan: iosm: fixes 7560 modem crash (M Chetan Kumar) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 057891447..c6546eb2c 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -1,6 +1,8 @@ + .../bindings/display/panel/himax,hx8394.yaml | 76 +++ Makefile | 4 + arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 3 +- + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 114 +++++ arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + @@ -15,20 +17,16 @@ drivers/firmware/efi/efi.c | 124 +++-- drivers/firmware/efi/secureboot.c | 38 ++ drivers/firmware/sysfb.c | 18 +- - drivers/gpu/drm/nouveau/nouveau_backlight.c | 7 +- + drivers/gpu/drm/panel/Kconfig | 12 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-himax-hx8394.c | 451 ++++++++++++++++++ drivers/hid/hid-rmi.c | 66 --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 + - drivers/input/mouse/alps.c | 16 +- - drivers/input/mouse/focaltech.c | 8 +- drivers/input/rmi4/rmi_driver.c | 124 +++-- drivers/iommu/iommu.c | 22 + - drivers/net/wwan/iosm/iosm_ipc_imem.c | 7 + drivers/pci/quirks.c | 24 + drivers/usb/core/hub.c | 7 + drivers/usb/host/xhci-pci.c | 7 +- - drivers/usb/typec/ucsi/ucsi.c | 22 +- - fs/btrfs/ioctl.c | 2 + - fs/btrfs/qgroup.c | 11 +- include/linux/efi.h | 22 +- include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hooks.h | 6 + @@ -41,10 +39,92 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 43 files changed, 1029 insertions(+), 208 deletions(-) + 41 files changed, 1637 insertions(+), 181 deletions(-) +diff --git a/Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml b/Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml +new file mode 100644 +index 000000000000..1b2a1baa26f9 +--- /dev/null ++++ b/Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml +@@ -0,0 +1,76 @@ ++# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause) ++%YAML 1.2 ++--- ++$id: http://devicetree.org/schemas/display/panel/himax,hx8394.yaml# ++$schema: http://devicetree.org/meta-schemas/core.yaml# ++ ++title: Himax HX8394 MIPI-DSI LCD panel controller ++ ++maintainers: ++ - Ondrej Jirman ++ - Javier Martinez Canillas ++ ++description: ++ Device tree bindings for panels based on the Himax HX8394 controller, ++ such as the HannStar HSD060BHW4 720x1440 TFT LCD panel connected with ++ a MIPI-DSI video interface. ++ ++allOf: ++ - $ref: panel-common.yaml# ++ ++properties: ++ compatible: ++ items: ++ - enum: ++ - hannstar,hsd060bhw4 ++ - const: himax,hx8394 ++ ++ reg: true ++ ++ reset-gpios: true ++ ++ backlight: true ++ ++ port: true ++ ++ vcc-supply: ++ description: Panel power supply ++ ++ iovcc-supply: ++ description: I/O voltage supply ++ ++required: ++ - compatible ++ - reg ++ - reset-gpios ++ - backlight ++ - port ++ - vcc-supply ++ - iovcc-supply ++ ++additionalProperties: false ++ ++examples: ++ - | ++ #include ++ ++ dsi { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ panel@0 { ++ compatible = "hannstar,hsd060bhw4", "himax,hx8394"; ++ reg = <0>; ++ vcc-supply = <®_2v8_p>; ++ iovcc-supply = <®_1v8_p>; ++ reset-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>; ++ backlight = <&backlight>; ++ ++ port { ++ mipi_in_panel: endpoint { ++ remote-endpoint = <&mipi_out_panel>; ++ }; ++ }; ++ }; ++ }; ++ ++... diff --git a/Makefile b/Makefile -index 8732f7208d59..2ef18d9eed77 100644 +index 6ec0ec452e46..40a89b4c3682 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -95,6 +175,170 @@ index ddfd35c86bda..2b69e42dff58 100644 default "12" if ARM64_16K_PAGES default "11" help +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts +index a0795a2b1cb1..475ba78acc09 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts +@@ -29,6 +29,11 @@ chosen { + stdout-path = "serial2:115200n8"; + }; + ++ backlight: backlight { ++ compatible = "pwm-backlight"; ++ pwms = <&pwm0 0 50000 0>; ++ }; ++ + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; +@@ -102,6 +107,30 @@ wifi_pwrseq: sdio-wifi-pwrseq { + /* WL_REG_ON on module */ + reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; + }; ++ ++ /* MIPI DSI panel 1.8v supply */ ++ vcc1v8_lcd: vcc1v8-lcd { ++ compatible = "regulator-fixed"; ++ enable-active-high; ++ regulator-name = "vcc1v8_lcd"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vcc3v3_sys>; ++ gpio = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ }; ++ ++ /* MIPI DSI panel 2.8v supply */ ++ vcc2v8_lcd: vcc2v8-lcd { ++ compatible = "regulator-fixed"; ++ enable-active-high; ++ regulator-name = "vcc2v8_lcd"; ++ regulator-min-microvolt = <2800000>; ++ regulator-max-microvolt = <2800000>; ++ vin-supply = <&vcc3v3_sys>; ++ gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ }; + }; + + &cpu_alert0 { +@@ -139,6 +168,11 @@ &emmc_phy { + status = "okay"; + }; + ++&gpu { ++ mali-supply = <&vdd_gpu>; ++ status = "okay"; ++}; ++ + &i2c0 { + clock-frequency = <400000>; + i2c-scl-rising-time-ns = <168>; +@@ -333,6 +367,25 @@ regulator-state-mem { + }; + }; + ++&i2c3 { ++ i2c-scl-rising-time-ns = <450>; ++ i2c-scl-falling-time-ns = <15>; ++ status = "okay"; ++ ++ touchscreen@14 { ++ compatible = "goodix,gt1158"; ++ reg = <0x14>; ++ interrupt-parent = <&gpio3>; ++ interrupts = ; ++ irq-gpios = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>; ++ reset-gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_HIGH>; ++ AVDD28-supply = <&vcc3v0_touch>; ++ VDDIO-supply = <&vcc3v0_touch>; ++ touchscreen-size-x = <720>; ++ touchscreen-size-y = <1440>; ++ }; ++}; ++ + &cluster0_opp { + opp04 { + status = "disabled"; +@@ -362,6 +415,39 @@ &io_domains { + status = "okay"; + }; + ++&mipi_dsi { ++ status = "okay"; ++ clock-master; ++ ++ ports { ++ mipi_out: port@1 { ++ #address-cells = <0>; ++ #size-cells = <0>; ++ reg = <1>; ++ ++ mipi_out_panel: endpoint { ++ remote-endpoint = <&mipi_in_panel>; ++ }; ++ }; ++ }; ++ ++ panel@0 { ++ compatible = "hannstar,hsd060bhw4"; ++ reg = <0>; ++ backlight = <&backlight>; ++ reset-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_LOW>; ++ vcc-supply = <&vcc2v8_lcd>; ++ iovcc-supply = <&vcc1v8_lcd>; ++ pinctrl-names = "default"; ++ ++ port { ++ mipi_in_panel: endpoint { ++ remote-endpoint = <&mipi_out_panel>; ++ }; ++ }; ++ }; ++}; ++ + &pmu_io_domains { + pmu1830-supply = <&vcc_1v8>; + status = "okay"; +@@ -429,6 +515,10 @@ &sdio0 { + status = "okay"; + }; + ++&pwm0 { ++ status = "okay"; ++}; ++ + &sdmmc { + bus-width = <4>; + cap-sd-highspeed; +@@ -479,3 +569,27 @@ bluetooth { + &uart2 { + status = "okay"; + }; ++ ++&vopb { ++ status = "okay"; ++ assigned-clocks = <&cru DCLK_VOP0_DIV>, <&cru DCLK_VOP0>, ++ <&cru ACLK_VOP0>, <&cru HCLK_VOP0>; ++ assigned-clock-rates = <0>, <0>, <400000000>, <100000000>; ++ assigned-clock-parents = <&cru PLL_GPLL>, <&cru DCLK_VOP0_DIV>; ++}; ++ ++&vopb_mmu { ++ status = "okay"; ++}; ++ ++&vopl { ++ status = "okay"; ++ assigned-clocks = <&cru DCLK_VOP1_DIV>, <&cru DCLK_VOP1>, ++ <&cru ACLK_VOP1>, <&cru HCLK_VOP1>; ++ assigned-clock-rates = <0>, <0>, <400000000>, <100000000>; ++ assigned-clock-parents = <&cru PLL_GPLL>, <&cru DCLK_VOP1_DIV>; ++}; ++ ++&vopl_mmu { ++ status = "okay"; ++}; diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h index b0d00032479d..afb9544fb007 100644 --- a/arch/s390/include/asm/ipl.h @@ -598,32 +842,498 @@ index 3c197db42c9d..16e4a2e90fae 100644 pd = sysfb_create_simplefb(si, &mode); if (!IS_ERR(pd)) goto unlock_mutex; -diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c -index 40409a29f5b6..91b5ecc57538 100644 ---- a/drivers/gpu/drm/nouveau/nouveau_backlight.c -+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include +diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig +index 737edcdf9eef..7ee9c83f09a7 100644 +--- a/drivers/gpu/drm/panel/Kconfig ++++ b/drivers/gpu/drm/panel/Kconfig +@@ -154,6 +154,18 @@ config DRM_PANEL_FEIYANG_FY07024DI26A30D + Say Y if you want to enable support for panels based on the + Feiyang FY07024DI26A30-D MIPI-DSI interface. - #include "nouveau_drv.h" - #include "nouveau_reg.h" -@@ -299,8 +300,12 @@ 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; - -+ /* -+ * Note when this runs the connectors have not been probed yet, -+ * so nv_conn->base.status is not set yet. -+ */ - if (!nvif_rd32(device, NV50_PDISP_SOR_PWM_CTL(ffs(nv_encoder->dcb->or) - 1)) || -- nv_conn->base.status != connector_status_connected) -+ drm_helper_probe_detect(&nv_conn->base, NULL, false) != connector_status_connected) - return -ENODEV; - - if (nv_conn->type == DCB_CONNECTOR_eDP) { ++config DRM_PANEL_HIMAX_HX8394 ++ tristate "HIMAX HX8394 MIPI-DSI LCD panels" ++ depends on OF ++ depends on DRM_MIPI_DSI ++ depends on BACKLIGHT_CLASS_DEVICE ++ help ++ Say Y if you want to enable support for panels based on the ++ Himax HX8394 controller, such as the HannStar HSD060BHW4 ++ 720x1440 TFT LCD panel that uses a MIPI-DSI interface. ++ ++ If M is selected the module will be called panel-himax-hx8394. ++ + config DRM_PANEL_ILITEK_IL9322 + tristate "Ilitek ILI9322 320x240 QVGA panels" + depends on OF && SPI +diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile +index f8f9d9f6a307..84c01adafd4c 100644 +--- a/drivers/gpu/drm/panel/Makefile ++++ b/drivers/gpu/drm/panel/Makefile +@@ -13,6 +13,7 @@ obj-$(CONFIG_DRM_PANEL_EBBG_FT8719) += panel-ebbg-ft8719.o + obj-$(CONFIG_DRM_PANEL_ELIDA_KD35T133) += panel-elida-kd35t133.o + obj-$(CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02) += panel-feixin-k101-im2ba02.o + obj-$(CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D) += panel-feiyang-fy07024di26a30d.o ++obj-$(CONFIG_DRM_PANEL_HIMAX_HX8394) += panel-himax-hx8394.o + obj-$(CONFIG_DRM_PANEL_ILITEK_IL9322) += panel-ilitek-ili9322.o + obj-$(CONFIG_DRM_PANEL_ILITEK_ILI9341) += panel-ilitek-ili9341.o + obj-$(CONFIG_DRM_PANEL_ILITEK_ILI9881C) += panel-ilitek-ili9881c.o +diff --git a/drivers/gpu/drm/panel/panel-himax-hx8394.c b/drivers/gpu/drm/panel/panel-himax-hx8394.c +new file mode 100644 +index 000000000000..d4fb5d1b295b +--- /dev/null ++++ b/drivers/gpu/drm/panel/panel-himax-hx8394.c +@@ -0,0 +1,451 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Driver for panels based on Himax HX8394 controller, such as: ++ * ++ * - HannStar HSD060BHW4 5.99" MIPI-DSI panel ++ * ++ * Copyright (C) 2021 Kamil Trzciński ++ * ++ * Based on drivers/gpu/drm/panel/panel-sitronix-st7703.c ++ * Copyright (C) Purism SPC 2019 ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include