diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-03-22 15:08:19 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-03-22 15:08:19 -0500 |
| commit | ea07b7aad97f41bb4b451fc80bd3f102f0440053 (patch) | |
| tree | edc10f7fbb1695105371bcb5cd4018f74c124cab | |
| parent | 0265290bb39ecf865034a27795f35b538f657a00 (diff) | |
| download | kernel-ea07b7aad97f41bb4b451fc80bd3f102f0440053.tar.gz kernel-ea07b7aad97f41bb4b451fc80bd3f102f0440053.tar.xz kernel-ea07b7aad97f41bb4b451fc80bd3f102f0440053.zip | |
kernel-5.17-300
* Tue Mar 22 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17-300]
- Revert "PCI/MSI: Mask MSI-X vectors only on success" (Justin M. Forbes)
- Define SNAPSHOT correctly for VERSION_ON_UPSTREAM=0 (Justin M. Forbes)
- Config fixups after some RHEL specific patches were reverted (Justin M. Forbes)
- Basic Fedora Branch setup (Justin M. Forbes)
- Reset Makefile.rhelver for the 5.18 cycle (Justin M. Forbes)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
39 files changed, 310 insertions, 1984 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 8e2c23607..8e6ba0821 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 = 123 +RHEL_RELEASE = 0 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index f9c3949cc..a767a5c4b 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,306 +1,105 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/7b66f762ded9086774c6393b7a77ff2566757bae - 7b66f762ded9086774c6393b7a77ff2566757bae mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning +"https://gitlab.com/cki-project/kernel-ark/-/commit"/f2725627148ae8c46e9d740f8b93aa2fcd1739ec + f2725627148ae8c46e9d740f8b93aa2fcd1739ec Revert "PCI/MSI: Mask MSI-X vectors only on success" -"https://gitlab.com/cki-project/kernel-ark/-/commit"/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b - 4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops +"https://gitlab.com/cki-project/kernel-ark/-/commit"/2d071cdb802a028b5d3a406587b84793a4f9f141 + 2d071cdb802a028b5d3a406587b84793a4f9f141 arm64: use common CONFIG_MAX_ZONEORDER for arm kernel -"https://gitlab.com/cki-project/kernel-ark/-/commit"/c1ee15318f4a2688057fd1aeee6272603d0871f0 - c1ee15318f4a2688057fd1aeee6272603d0871f0 Fixup merge in random.c +"https://gitlab.com/cki-project/kernel-ark/-/commit"/738aa194128ecb4b9c90db8509cfdce9db50ef3a + 738aa194128ecb4b9c90db8509cfdce9db50ef3a crypto: rng - Override drivers/char/random in FIPS mode -"https://gitlab.com/cki-project/kernel-ark/-/commit"/8de7ca8b26e143a48e66dd1d6309a5e4115ffcb6 - 8de7ca8b26e143a48e66dd1d6309a5e4115ffcb6 kabi: Add kABI macros for enum type +"https://gitlab.com/cki-project/kernel-ark/-/commit"/cc927bb8f58a4a87394aeafc9688a2a3ac30fed0 + cc927bb8f58a4a87394aeafc9688a2a3ac30fed0 random: Add hook to override device reads and getrandom(2) -"https://gitlab.com/cki-project/kernel-ark/-/commit"/3f4e8e79d3aaba0e7c9eecc47d2bb3fee741cb6a - 3f4e8e79d3aaba0e7c9eecc47d2bb3fee741cb6a kabi: expand and clarify documentation of aux structs +"https://gitlab.com/cki-project/kernel-ark/-/commit"/bf41f6c72439c34bfbcad7264beda9d617442362 + bf41f6c72439c34bfbcad7264beda9d617442362 RHEL: disable io_uring support -"https://gitlab.com/cki-project/kernel-ark/-/commit"/86b381142c544134ddef62469e8dd8a0eb64cdf4 - 86b381142c544134ddef62469e8dd8a0eb64cdf4 kabi: introduce RH_KABI_USE_AUX_PTR +"https://gitlab.com/cki-project/kernel-ark/-/commit"/1429761073806cf785dfdad697ce771a3fafb617 + 1429761073806cf785dfdad697ce771a3fafb617 nvme: nvme_mpath_init remove multipath check -"https://gitlab.com/cki-project/kernel-ark/-/commit"/8fcb03036ae488acf9257f0babe477b4474b546c - 8fcb03036ae488acf9257f0babe477b4474b546c kabi: rename RH_KABI_SIZE_AND_EXTEND to AUX +"https://gitlab.com/cki-project/kernel-ark/-/commit"/2a6a9d6664d8cd6b68560551f8a80898f0867364 + 2a6a9d6664d8cd6b68560551f8a80898f0867364 nvme: decouple basic ANA log page re-read support from native multipathing -"https://gitlab.com/cki-project/kernel-ark/-/commit"/07bd34c562953c1be1a12c3fcbd0ef15a87cfd4b - 07bd34c562953c1be1a12c3fcbd0ef15a87cfd4b kabi: more consistent _RH_KABI_SIZE_AND_EXTEND +"https://gitlab.com/cki-project/kernel-ark/-/commit"/cc464f9399e463d2eb01bf2cb02bd94f5e888745 + cc464f9399e463d2eb01bf2cb02bd94f5e888745 nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT -"https://gitlab.com/cki-project/kernel-ark/-/commit"/e87ffabceba1712c7cf6f3a9b42d2242c3e9a220 - e87ffabceba1712c7cf6f3a9b42d2242c3e9a220 kabi: use fixed field name for extended part +"https://gitlab.com/cki-project/kernel-ark/-/commit"/9ac12152fb791934f6da2a48b14023e8d919a281 + 9ac12152fb791934f6da2a48b14023e8d919a281 nvme: Return BLK_STS_TARGET if the DNR bit is set -"https://gitlab.com/cki-project/kernel-ark/-/commit"/da92a8cda48e7f1475e21b07282190ccbef93d0f - da92a8cda48e7f1475e21b07282190ccbef93d0f kabi: fix dereference in RH_KABI_CHECK_EXT +"https://gitlab.com/cki-project/kernel-ark/-/commit"/dbfc0e9f500e611ff0b81de7e8097493a09e252e + dbfc0e9f500e611ff0b81de7e8097493a09e252e REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70 -"https://gitlab.com/cki-project/kernel-ark/-/commit"/f10725d312d109970c154eb160a52c16432724bf - f10725d312d109970c154eb160a52c16432724bf kabi: fix RH_KABI_SET_SIZE macro +"https://gitlab.com/cki-project/kernel-ark/-/commit"/911eee5c10b84a68308bd7b66cd8eae863befe4f + 911eee5c10b84a68308bd7b66cd8eae863befe4f KEYS: Make use of platform keyring for module signature verify -"https://gitlab.com/cki-project/kernel-ark/-/commit"/b5e2e9b785ae15c4513da11aac44e8b86af3ab94 - b5e2e9b785ae15c4513da11aac44e8b86af3ab94 kabi: expand and clarify documentation +"https://gitlab.com/cki-project/kernel-ark/-/commit"/b180dc9bfe0a7e2311e96d8ece0d3a76877801bd + b180dc9bfe0a7e2311e96d8ece0d3a76877801bd Input: rmi4 - remove the need for artificial IRQ in case of HID -"https://gitlab.com/cki-project/kernel-ark/-/commit"/c0af090ecabac4d176ea3501b68f576f517b4a09 - c0af090ecabac4d176ea3501b68f576f517b4a09 kabi: make RH_KABI_USE replace any number of reserved fields +"https://gitlab.com/cki-project/kernel-ark/-/commit"/cb3795056f925c08d2ef291e28503cec42a76c99 + cb3795056f925c08d2ef291e28503cec42a76c99 ARM: tegra: usb no reset -"https://gitlab.com/cki-project/kernel-ark/-/commit"/79bee808c6a10aa8e722cc6e5e7d59dfd00b5ab7 - 79bee808c6a10aa8e722cc6e5e7d59dfd00b5ab7 kabi: rename RH_KABI_USE2 to RH_KABI_USE_SPLIT +"https://gitlab.com/cki-project/kernel-ark/-/commit"/bc1953d9a3f7084a7e06d0ce52d801393002dd5d + bc1953d9a3f7084a7e06d0ce52d801393002dd5d arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT -"https://gitlab.com/cki-project/kernel-ark/-/commit"/cc866b14f70b7b69cd1760c6778d020dd3b11dac - cc866b14f70b7b69cd1760c6778d020dd3b11dac kabi: change RH_KABI_REPLACE2 to RH_KABI_REPLACE_SPLIT +"https://gitlab.com/cki-project/kernel-ark/-/commit"/5db68e40dbdafebe457a6f3a4c2956e744ec33fc + 5db68e40dbdafebe457a6f3a4c2956e744ec33fc Add option of 13 for FORCE_MAX_ZONEORDER -"https://gitlab.com/cki-project/kernel-ark/-/commit"/681595d3ab5b38ead06cdccf6753ef8f6584e920 - 681595d3ab5b38ead06cdccf6753ef8f6584e920 kabi: change RH_KABI_REPLACE_UNSAFE to RH_KABI_BROKEN_REPLACE +"https://gitlab.com/cki-project/kernel-ark/-/commit"/cb780b02a945bac79ffdebd87eeab665b4ad4d64 + cb780b02a945bac79ffdebd87eeab665b4ad4d64 s390: Lock down the kernel when the IPL secure flag is set -"https://gitlab.com/cki-project/kernel-ark/-/commit"/6b0b54eb111834c460fab7a1f9709e03ccd92287 - 6b0b54eb111834c460fab7a1f9709e03ccd92287 kabi: introduce RH_KABI_ADD_MODIFIER +"https://gitlab.com/cki-project/kernel-ark/-/commit"/969761f2e44ee74124393c9262c43aa411ef9010 + 969761f2e44ee74124393c9262c43aa411ef9010 efi: Lock down the kernel if booted in secure boot mode -"https://gitlab.com/cki-project/kernel-ark/-/commit"/34fea3d44eb92556ec0b9b576c652cd21acec7e8 - 34fea3d44eb92556ec0b9b576c652cd21acec7e8 kabi: Include kconfig.h +"https://gitlab.com/cki-project/kernel-ark/-/commit"/5b082b5e93ac0da9eccd3ebc307c3870dcfa8693 + 5b082b5e93ac0da9eccd3ebc307c3870dcfa8693 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode -"https://gitlab.com/cki-project/kernel-ark/-/commit"/8638f77f36a8d0f5965583f4ede2a319aec0b0bb - 8638f77f36a8d0f5965583f4ede2a319aec0b0bb kabi: macros for intentional kABI breakage +"https://gitlab.com/cki-project/kernel-ark/-/commit"/67cf2dc78797e7f6676d4867a75f0dccc182bf4e + 67cf2dc78797e7f6676d4867a75f0dccc182bf4e security: lockdown: expose a hook to lock the kernel down -"https://gitlab.com/cki-project/kernel-ark/-/commit"/31ed0967ebcc6f5b7d72717fc5d5c5417a6fa558 - 31ed0967ebcc6f5b7d72717fc5d5c5417a6fa558 kabi: fix the note about terminating semicolon +"https://gitlab.com/cki-project/kernel-ark/-/commit"/6636a5e389455100ffe774c548e25f65d68dc831 + 6636a5e389455100ffe774c548e25f65d68dc831 Make get_cert_list() use efi_status_to_str() to print error messages. -"https://gitlab.com/cki-project/kernel-ark/-/commit"/f2a759d299ddcbb63cd3edc14e3f29f44f61278b - f2a759d299ddcbb63cd3edc14e3f29f44f61278b kabi: introduce RH_KABI_HIDE_INCLUDE and RH_KABI_FAKE_INCLUDE +"https://gitlab.com/cki-project/kernel-ark/-/commit"/df6297f5d662243a3aceb51505ae395316ed4e92 + df6297f5d662243a3aceb51505ae395316ed4e92 Add efi_status_to_str() and rework efi_status_to_err(). -"https://gitlab.com/cki-project/kernel-ark/-/commit"/309ccf0b279d3f3e7a88fb8889defc10c5ffa818 - 309ccf0b279d3f3e7a88fb8889defc10c5ffa818 lib/crypto: add prompts back to crypto libraries +"https://gitlab.com/cki-project/kernel-ark/-/commit"/927292870f81cdd73f2fc25f63e224455cd882b3 + 927292870f81cdd73f2fc25f63e224455cd882b3 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT -"https://gitlab.com/cki-project/kernel-ark/-/commit"/e582ea6a9572e95b13cc26aefe65cacb892a55c7 - e582ea6a9572e95b13cc26aefe65cacb892a55c7 [redhat] virtio: enable virtio-mem on x86-64 as tech-preview +"https://gitlab.com/cki-project/kernel-ark/-/commit"/f0dbf9b43d38b054812b2f69cff81c110edcf348 + f0dbf9b43d38b054812b2f69cff81c110edcf348 iommu/arm-smmu: workaround DMA mode issues -"https://gitlab.com/cki-project/kernel-ark/-/commit"/aa7ea266d2b6a3d865060945da1f8c674640e989 - aa7ea266d2b6a3d865060945da1f8c674640e989 pci.h: Fix static include +"https://gitlab.com/cki-project/kernel-ark/-/commit"/d6f9d6b208a2378f12a5ebb214844b0924500d70 + d6f9d6b208a2378f12a5ebb214844b0924500d70 ipmi: do not configure ipmi for HPE m400 -"https://gitlab.com/cki-project/kernel-ark/-/commit"/ab9b12e71b4d2cdc605a2f2b8b674a61e6b955e3 - ab9b12e71b4d2cdc605a2f2b8b674a61e6b955e3 drivers/pci/pci-driver.c: Fix if/ifdef typo +"https://gitlab.com/cki-project/kernel-ark/-/commit"/1d4597b7b8f1c20ac6d1d3845bb0336cedf066f3 + 1d4597b7b8f1c20ac6d1d3845bb0336cedf066f3 ahci: thunderx2: Fix for errata that affects stop engine -"https://gitlab.com/cki-project/kernel-ark/-/commit"/cf796e6a380ac8e99da6493d47d24c86aab308ad - cf796e6a380ac8e99da6493d47d24c86aab308ad kernel/rh_taint.c: Update to new messaging +"https://gitlab.com/cki-project/kernel-ark/-/commit"/2a4dda2b720549af21fb82c101686c59b0a9c327 + 2a4dda2b720549af21fb82c101686c59b0a9c327 Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon -"https://gitlab.com/cki-project/kernel-ark/-/commit"/a30c3806b0424610f5fae38a7b93a445cb159b0b - a30c3806b0424610f5fae38a7b93a445cb159b0b Enable e1000 in rhel9 as unsupported +"https://gitlab.com/cki-project/kernel-ark/-/commit"/fc99e0531403fb88b37e6c61268d76efc9b1387f + fc99e0531403fb88b37e6c61268d76efc9b1387f tags.sh: Ignore redhat/rpm -"https://gitlab.com/cki-project/kernel-ark/-/commit"/99181c22f9315917b65b760a70088b7aa122ee87 - 99181c22f9315917b65b760a70088b7aa122ee87 redhat: Add mark_driver_deprecated() +"https://gitlab.com/cki-project/kernel-ark/-/commit"/f73056738cf5539edc6eac008a18013937c63013 + f73056738cf5539edc6eac008a18013937c63013 put RHEL info into generated headers -"https://gitlab.com/cki-project/kernel-ark/-/commit"/016427b34060bc71819e9dae22b61c45559b49ce - 016427b34060bc71819e9dae22b61c45559b49ce arm64: use common CONFIG_MAX_ZONEORDER for arm kernel +"https://gitlab.com/cki-project/kernel-ark/-/commit"/fd88613d6c9440505a1163a7d9f8ec538d174693 + fd88613d6c9440505a1163a7d9f8ec538d174693 aarch64: acpi scan: Fix regression related to X-Gene UARTs -"https://gitlab.com/cki-project/kernel-ark/-/commit"/01b34c70566012a8f9c150057755f44ee2711294 - 01b34c70566012a8f9c150057755f44ee2711294 [fs] dax: mark tech preview +"https://gitlab.com/cki-project/kernel-ark/-/commit"/0289a4802cb35c5b020a2e29bda909196d41b829 + 0289a4802cb35c5b020a2e29bda909196d41b829 ACPI / irq: Workaround firmware issue on X-Gene based m400 -"https://gitlab.com/cki-project/kernel-ark/-/commit"/49debb9a526e212d9e5d7ccd0b1087561af91115 - 49debb9a526e212d9e5d7ccd0b1087561af91115 [scsi] megaraid_sas: re-add certain pci-ids +"https://gitlab.com/cki-project/kernel-ark/-/commit"/eb6e7ccfc9efc83233d454ff3243c51049dda35e + eb6e7ccfc9efc83233d454ff3243c51049dda35e modules: add rhelversion MODULE_INFO tag -"https://gitlab.com/cki-project/kernel-ark/-/commit"/0c5b51ffb7ddc1e371d3f3e2cff6daa20a851740 - 0c5b51ffb7ddc1e371d3f3e2cff6daa20a851740 crypto: rng - Override drivers/char/random in FIPS mode +"https://gitlab.com/cki-project/kernel-ark/-/commit"/a46e7d8d11b3506b198e3a6c358950c5309638a8 + a46e7d8d11b3506b198e3a6c358950c5309638a8 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support -"https://gitlab.com/cki-project/kernel-ark/-/commit"/49ab59830b0858ea5e4f27bfa7c6234d02bf487c - 49ab59830b0858ea5e4f27bfa7c6234d02bf487c random: Add hook to override device reads and getrandom(2) +"https://gitlab.com/cki-project/kernel-ark/-/commit"/fab8720f02633b2d8b1d0df2351a73c6b5db6449 + fab8720f02633b2d8b1d0df2351a73c6b5db6449 Introduce CONFIG_RH_DISABLE_DEPRECATED -"https://gitlab.com/cki-project/kernel-ark/-/commit"/981be82d5afa53d4907911d4808f0c3535f550a6 - 981be82d5afa53d4907911d4808f0c3535f550a6 RHEL: disable io_uring support +"https://gitlab.com/cki-project/kernel-ark/-/commit"/ef2ae19ad4a99580b912338c8b2b5ad44c784578 + ef2ae19ad4a99580b912338c8b2b5ad44c784578 Pull the RHEL version defines out of the Makefile -"https://gitlab.com/cki-project/kernel-ark/-/commit"/f5c034335b35b81b98574589470891a4c6722b4c - f5c034335b35b81b98574589470891a4c6722b4c bpf: Fix unprivileged_bpf_disabled setup - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/616409254adab64bafe845a6d3e1dcc2ea2e56b0 - 616409254adab64bafe845a6d3e1dcc2ea2e56b0 nvme: nvme_mpath_init remove multipath check - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/661584df3cad4cf2bfdc4e3115a943dac7486260 - 661584df3cad4cf2bfdc4e3115a943dac7486260 team: mark team driver as deprecated - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/6350098c0964eb01a3ebbcf724ab6bf50bfdd5ea - 6350098c0964eb01a3ebbcf724ab6bf50bfdd5ea mm/cma: mark CMA on x86_64 tech preview and print RHEL-specific infos - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/299ca8ac69d7ee891de9c2c0e7b6abacfc915fb1 - 299ca8ac69d7ee891de9c2c0e7b6abacfc915fb1 wireguard: disable in FIPS mode - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/18d795e42472758f95c970ba91144de337ed1926 - 18d795e42472758f95c970ba91144de337ed1926 nvme: decouple basic ANA log page re-read support from native multipathing - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/79f14246be0c50bc42dee1394a3d30447d7ec762 - 79f14246be0c50bc42dee1394a3d30447d7ec762 nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/45f8a67b9067a91cb10e495a4d00a1f051b58228 - 45f8a67b9067a91cb10e495a4d00a1f051b58228 nvme: Return BLK_STS_TARGET if the DNR bit is set - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/e0085856e822367f1d55c8da7d868d5d05c37dd6 - e0085856e822367f1d55c8da7d868d5d05c37dd6 wireguard: mark as Tech Preview - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/4f5b4c1f72808e2536f255cf1bb5250380411939 - 4f5b4c1f72808e2536f255cf1bb5250380411939 REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70 - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/8bd3d2fef0252b00fb2e7391eb3f2be172e6da4a - 8bd3d2fef0252b00fb2e7391eb3f2be172e6da4a redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/77bfb2d4b0338c7f094316f6a1a317b61269a771 - 77bfb2d4b0338c7f094316f6a1a317b61269a771 Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL only - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/798c8b9b0ae5251934035ec972b15fa86c77c079 - 798c8b9b0ae5251934035ec972b15fa86c77c079 arch/x86: Remove vendor specific CPU ID checks - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/ad22d5b0d90cf8fc6dc1842cc9032e43577e96f3 - ad22d5b0d90cf8fc6dc1842cc9032e43577e96f3 redhat: Replace hardware.redhat.com link in Unsupported message - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/7d9120eb26aaa9cab75e7179e08dcbc3188f341e - 7d9120eb26aaa9cab75e7179e08dcbc3188f341e x86: Fix compile issues with rh_check_supported() - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/d0b46ddd56d04d8793cd0fc6c8603af101ccf8a0 - d0b46ddd56d04d8793cd0fc6c8603af101ccf8a0 KEYS: Make use of platform keyring for module signature verify - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/5b12f752d6c42fc1070ae0319aa5f8a81dd663de - 5b12f752d6c42fc1070ae0319aa5f8a81dd663de Input: rmi4 - remove the need for artificial IRQ in case of HID - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/9f6586dca8ddec2cacc00825026e6b11b6b99b52 - 9f6586dca8ddec2cacc00825026e6b11b6b99b52 ARM: tegra: usb no reset - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/ba71e12854d72bafa99b009f595e86567b730dd1 - ba71e12854d72bafa99b009f595e86567b730dd1 arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/36150995943464b906b96246251893d376b4f2a8 - 36150995943464b906b96246251893d376b4f2a8 redhat: rh_kabi: deduplication friendly structs - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/6326cef96ee313f30980013d8f3ced47f17ab008 - 6326cef96ee313f30980013d8f3ced47f17ab008 redhat: rh_kabi add a comment with warning about RH_KABI_EXCLUDE usage - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/fe9bae85dc78fde94016ea9a2ae5a3cd31897578 - fe9bae85dc78fde94016ea9a2ae5a3cd31897578 redhat: rh_kabi: introduce RH_KABI_EXTEND_WITH_SIZE - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/952ad67a16eab935a5059b5809945fec448a4202 - 952ad67a16eab935a5059b5809945fec448a4202 redhat: rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve. - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/568a88ddc686e55900146ae35a31ee5f9af8b6fd - 568a88ddc686e55900146ae35a31ee5f9af8b6fd redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference operator - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/ab598aa6ce467e3157c203db0ce36944750a43e5 - ab598aa6ce467e3157c203db0ce36944750a43e5 redhat: rh_kabi: Add macros to size and extend structs - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/e0be2cf6271eebf5644a1e0ef04bd7acf8ceebf0 - e0be2cf6271eebf5644a1e0ef04bd7acf8ceebf0 Removing Obsolete hba pci-ids from rhel8 - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/7e761c32ef94adada70244bba8bfb7c8f302b4b3 - 7e761c32ef94adada70244bba8bfb7c8f302b4b3 mptsas: pci-id table changes - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/5f5be97331bf13bec546bf93d874817baef5d31b - 5f5be97331bf13bec546bf93d874817baef5d31b mptsas: Taint kernel if mptsas is loaded - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/5cc4742a2435cbe52e38e60b86f8521eb60a93fd - 5cc4742a2435cbe52e38e60b86f8521eb60a93fd mptspi: pci-id table changes - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/96d74f2b9f3f7a78f0fe985a749593e89ac172d4 - 96d74f2b9f3f7a78f0fe985a749593e89ac172d4 qla2xxx: Remove PCI IDs of deprecated adapter - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/df94c0106ec38e35ccb7a4087a6613fdb8fbbb9b - df94c0106ec38e35ccb7a4087a6613fdb8fbbb9b be2iscsi: remove unsupported device IDs - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/5f2d27c6db1ddb9cf566e72a580800be0cbf25bb - 5f2d27c6db1ddb9cf566e72a580800be0cbf25bb mptspi: Taint kernel if mptspi is loaded - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/1217d330b082f7bafff81a8084d73c259cf2e990 - 1217d330b082f7bafff81a8084d73c259cf2e990 hpsa: remove old cciss-based smartarray pci ids - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/d755f2826bf24bb62eba4cb2d653aaa2c1140894 - d755f2826bf24bb62eba4cb2d653aaa2c1140894 qla4xxx: Remove deprecated PCI IDs from RHEL 8 - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/fa7b1655d4cfc7ee76227a9e665b55c7caebf4a2 - fa7b1655d4cfc7ee76227a9e665b55c7caebf4a2 aacraid: Remove depreciated device and vendor PCI id's - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/71fc877b2e067442a7d17bfacc2c1edddb753baa - 71fc877b2e067442a7d17bfacc2c1edddb753baa megaraid_sas: remove deprecated pci-ids - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/117432b276e680d4c0f5d3391e83a174b77f5e15 - 117432b276e680d4c0f5d3391e83a174b77f5e15 mpt*: remove certain deprecated pci-ids - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/fc34b9f56e5dfc5729ead061c832a07747bfc39c - fc34b9f56e5dfc5729ead061c832a07747bfc39c kernel: add SUPPORT_REMOVED kernel taint - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/f005123a20525c754e469fa8f6fe1ba0cd7b598a - f005123a20525c754e469fa8f6fe1ba0cd7b598a Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/13618086ff8cf4b5f91ffe726e861dcb79a8487b - 13618086ff8cf4b5f91ffe726e861dcb79a8487b Add option of 13 for FORCE_MAX_ZONEORDER - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/18b447f7d46229cc9edde91f36705a41ed78ba6e - 18b447f7d46229cc9edde91f36705a41ed78ba6e s390: Lock down the kernel when the IPL secure flag is set - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/e1a97248643b3f8a00aa8b6f7aa2d9a408f6b6bb - e1a97248643b3f8a00aa8b6f7aa2d9a408f6b6bb efi: Lock down the kernel if booted in secure boot mode - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/7223eda9e191fd413db43ee9531a79778772823f - 7223eda9e191fd413db43ee9531a79778772823f efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/6f58e142acad0f851eb2e63bc81276caf051149c - 6f58e142acad0f851eb2e63bc81276caf051149c security: lockdown: expose a hook to lock the kernel down - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/be122cc739c64d338ea2b848421a344ce3d42402 - be122cc739c64d338ea2b848421a344ce3d42402 Make get_cert_list() use efi_status_to_str() to print error messages. - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/4976718a0b5eb8916710c94cbdb562dabef3439a - 4976718a0b5eb8916710c94cbdb562dabef3439a Add efi_status_to_str() and rework efi_status_to_err(). - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/0aaad4cff456a614bbd3b2055b2b3b4b2ea60278 - 0aaad4cff456a614bbd3b2055b2b3b4b2ea60278 Add support for deprecating processors - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/dd84f1b8e3ea090fa2f3c683f566dd43ee04afb8 - dd84f1b8e3ea090fa2f3c683f566dd43ee04afb8 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/164df8306d85ccf6e1dfa9c9a6a0420f8c8e9e95 - 164df8306d85ccf6e1dfa9c9a6a0420f8c8e9e95 iommu/arm-smmu: workaround DMA mode issues - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/b644c0962c0a18a007bf95a7d76eba0489edaf11 - b644c0962c0a18a007bf95a7d76eba0489edaf11 rh_kabi: introduce RH_KABI_EXCLUDE - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/3c82082d08d5db5a25a750b34b97d5b94cebe3c8 - 3c82082d08d5db5a25a750b34b97d5b94cebe3c8 ipmi: do not configure ipmi for HPE m400 - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/dcb61478056d4bcfc0f2c0ca153afb5ff3a9eac1 - dcb61478056d4bcfc0f2c0ca153afb5ff3a9eac1 kABI: Add generic kABI macros to use for kABI workarounds - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/cf9b55e151e9293d2a49558a6ada3eedcbf521db - cf9b55e151e9293d2a49558a6ada3eedcbf521db add pci_hw_vendor_status() - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/3f8fef2dcbf64f0376ada721aaa0eb0eec113601 - 3f8fef2dcbf64f0376ada721aaa0eb0eec113601 ahci: thunderx2: Fix for errata that affects stop engine - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/2ead536c1d78c352616bde0f60ff2c1246badbf5 - 2ead536c1d78c352616bde0f60ff2c1246badbf5 Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/6f2dfeccb88550706f528ad83f4136d508c845cf - 6f2dfeccb88550706f528ad83f4136d508c845cf bpf: set unprivileged_bpf_disabled to 1 by default, add a boot parameter - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/88cef29b1329b9567b8993dd97340ea446590dc8 - 88cef29b1329b9567b8993dd97340ea446590dc8 add Red Hat-specific taint flags - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/eff454ef4fa7f5d610463d0ac60e3c58501d6238 - eff454ef4fa7f5d610463d0ac60e3c58501d6238 tags.sh: Ignore redhat/rpm - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/4a58c9144f2127f5a0940dd19e41392e3fca9207 - 4a58c9144f2127f5a0940dd19e41392e3fca9207 put RHEL info into generated headers - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/6d85897ed7ceca0d77e4895d2d133d76dff5fd7e - 6d85897ed7ceca0d77e4895d2d133d76dff5fd7e acpi: prefer booting with ACPI over DTS - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/ea61b537cb9030e4b2bcc88f1f0d7fedc193723f - ea61b537cb9030e4b2bcc88f1f0d7fedc193723f aarch64: acpi scan: Fix regression related to X-Gene UARTs - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/179e4512a3b10522870657b636528080db36b125 - 179e4512a3b10522870657b636528080db36b125 ACPI / irq: Workaround firmware issue on X-Gene based m400 - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/55a702f581accfcfad08e402c3eb568c9e665221 - 55a702f581accfcfad08e402c3eb568c9e665221 modules: add rhelversion MODULE_INFO tag - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/4dfc20c07960f9261928bf0efb503c9e53c249e4 - 4dfc20c07960f9261928bf0efb503c9e53c249e4 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/e63f21d271de59beb6eb54150eac51e20b5eff5b - e63f21d271de59beb6eb54150eac51e20b5eff5b Add Red Hat tainting - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/9b6800f2871b7092f2722295cb3ba05e3a37c3c7 - 9b6800f2871b7092f2722295cb3ba05e3a37c3c7 Introduce CONFIG_RH_DISABLE_DEPRECATED - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/51dfaf8dc482e9568e86d89c0ef910fe34716d5d - 51dfaf8dc482e9568e86d89c0ef910fe34716d5d Pull the RHEL version defines out of the Makefile - -"https://gitlab.com/cki-project/kernel-ark/-/commit"/34c394fd1a946f96dfd7f9a6da88a3df8975c8a7 - 34c394fd1a946f96dfd7f9a6da88a3df8975c8a7 [initial commit] Add Red Hat variables in the top level makefile +"https://gitlab.com/cki-project/kernel-ark/-/commit"/5c9b05aa2b52594f00c79370ea7bc88c5bed1dc2 + 5c9b05aa2b52594f00c79370ea7bc88c5bed1dc2 [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 8386621ee..31a6b4ef0 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5754,6 +5754,7 @@ CONFIG_RESET_TI_SYSCON=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -8209,7 +8210,7 @@ CONFIG_VCNL3020=m CONFIG_VCNL4000=m CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -8453,6 +8454,7 @@ CONFIG_VMAP_STACK=y # CONFIG_VMSPLIT_3G_OPT is not set CONFIG_VMSPLIT_3G=y CONFIG_VMXNET3=m +# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 8568b048a..b6013a37b 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -816,17 +816,11 @@ CONFIG_CLS_U32_PERF=y # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set # CONFIG_CM36651 is not set -CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set -CONFIG_CMA_SIZE_MBYTES=0 -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA is not set CONFIG_CMA_SYSFS=y -CONFIG_CMA=y CONFIG_CMDLINE="console=ttyAMA0" # CONFIG_CMDLINE_FORCE is not set CONFIG_CMDLINE_FROM_BOOTLOADER=y @@ -1213,7 +1207,7 @@ CONFIG_DMABUF_HEAPS=y CONFIG_DMABUF_MOVE_NOTIFY=y # CONFIG_DMABUF_SELFTESTS is not set # CONFIG_DMABUF_SYSFS_STATS is not set -CONFIG_DMA_CMA=y +# CONFIG_DMA_CMA is not set CONFIG_DMADEVICES_DEBUG=y CONFIG_DMADEVICES_VDEBUG=y CONFIG_DMADEVICES=y @@ -2366,6 +2360,7 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set +# CONFIG_INTEL_MIC_BUS is not set # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -3438,7 +3433,7 @@ CONFIG_NET_CORE=y CONFIG_NETDEV_ADDR_LIST_TEST=m CONFIG_NETDEVICES=y CONFIG_NET_DEVLINK=y -# CONFIG_NET_DEV_REFCNT_TRACKER is not set +CONFIG_NET_DEV_REFCNT_TRACKER=y CONFIG_NETDEVSIM=m CONFIG_NET_DROP_MONITOR=y # CONFIG_NET_DSA is not set @@ -3555,7 +3550,7 @@ CONFIG_NETLINK_DIAG=y CONFIG_NET_MPLS_GSO=y # CONFIG_NET_NCSI is not set CONFIG_NET_NSH=y -# CONFIG_NET_NS_REFCNT_TRACKER is not set +CONFIG_NET_NS_REFCNT_TRACKER=y CONFIG_NET_NS=y CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y @@ -4484,6 +4479,7 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -4706,6 +4702,7 @@ CONFIG_SCHED_SMT=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_TRACER=y +# CONFIG_SCIF_BUS is not set # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_3W_SAS is not set # CONFIG_SCSI_AACRAID is not set @@ -6716,6 +6713,7 @@ CONFIG_VMAP_STACK=y # CONFIG_VME_BUS is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_VMXNET3=m +# CONFIG_VOP_BUS is not set CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 772ab0547..394be3314 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5729,6 +5729,7 @@ CONFIG_RESET_TI_SYSCON=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -8182,7 +8183,7 @@ CONFIG_VCNL3020=m CONFIG_VCNL4000=m CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -8426,6 +8427,7 @@ CONFIG_VMAP_STACK=y # CONFIG_VMSPLIT_3G_OPT is not set CONFIG_VMSPLIT_3G=y CONFIG_VMXNET3=m +# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 76ea916e4..7b751aab4 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -816,17 +816,11 @@ CONFIG_CLS_U32_PERF=y # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set # CONFIG_CM36651 is not set -CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set -CONFIG_CMA_SIZE_MBYTES=0 -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA is not set CONFIG_CMA_SYSFS=y -CONFIG_CMA=y CONFIG_CMDLINE="console=ttyAMA0" # CONFIG_CMDLINE_FORCE is not set CONFIG_CMDLINE_FROM_BOOTLOADER=y @@ -1205,7 +1199,7 @@ CONFIG_DMABUF_HEAPS=y CONFIG_DMABUF_MOVE_NOTIFY=y # CONFIG_DMABUF_SELFTESTS is not set # CONFIG_DMABUF_SYSFS_STATS is not set -CONFIG_DMA_CMA=y +# CONFIG_DMA_CMA is not set # CONFIG_DMADEVICES_DEBUG is not set # CONFIG_DMADEVICES_VDEBUG is not set CONFIG_DMADEVICES=y @@ -2350,6 +2344,7 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set +# CONFIG_INTEL_MIC_BUS is not set # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -4461,6 +4456,7 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -4683,6 +4679,7 @@ CONFIG_SCHED_SMT=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_TRACER=y +# CONFIG_SCIF_BUS is not set # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_3W_SAS is not set # CONFIG_SCSI_AACRAID is not set @@ -6691,6 +6688,7 @@ CONFIG_VMAP_STACK=y # CONFIG_VME_BUS is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_VMXNET3=m +# CONFIG_VOP_BUS is not set CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 8f5173371..3fccb6bf8 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -5858,6 +5858,7 @@ CONFIG_RESET_TI_SYSCON=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -8431,7 +8432,7 @@ CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -8700,6 +8701,7 @@ CONFIG_VLAN_8021Q_MVRP=y # CONFIG_VMSPLIT_3G_OPT is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index efc6ad7f8..b70ae13dd 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -5834,6 +5834,7 @@ CONFIG_RESET_TI_SYSCON=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -8405,7 +8406,7 @@ CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -8674,6 +8675,7 @@ CONFIG_VLAN_8021Q_MVRP=y # CONFIG_VMSPLIT_3G_OPT is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 84f82cf3a..5e9026d22 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -5689,6 +5689,7 @@ CONFIG_RESET_TI_SYSCON=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -8186,7 +8187,7 @@ CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -8443,6 +8444,7 @@ CONFIG_VLAN_8021Q_MVRP=y # CONFIG_VMSPLIT_3G_OPT is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 9fadb8ccd..a2e4d3f7c 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5665,6 +5665,7 @@ CONFIG_RESET_TI_SYSCON=m CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -8160,7 +8161,7 @@ CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -8417,6 +8418,7 @@ CONFIG_VLAN_8021Q_MVRP=y # CONFIG_VMSPLIT_3G_OPT is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 476db613a..3cd522ccd 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -5125,6 +5125,7 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -7348,7 +7349,7 @@ CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -7570,6 +7571,7 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m +# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 5b6939aad..d2b18e2c6 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -5101,6 +5101,7 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -7322,7 +7323,7 @@ CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -7544,6 +7545,7 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m +# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index ebfbc4c89..26daa0f41 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4833,6 +4833,7 @@ CONFIG_REMOTEPROC=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -7017,7 +7018,7 @@ CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -7228,6 +7229,7 @@ CONFIG_VLAN_8021Q_MVRP=y # CONFIG_VMSPLIT_3G_OPT is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 9bc56a1d0..5385d5dd8 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2191,6 +2191,7 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set +# CONFIG_INTEL_MIC_BUS is not set # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -3253,7 +3254,7 @@ CONFIG_NET_CORE=y CONFIG_NETDEV_ADDR_LIST_TEST=m CONFIG_NETDEVICES=y CONFIG_NET_DEVLINK=y -# CONFIG_NET_DEV_REFCNT_TRACKER is not set +CONFIG_NET_DEV_REFCNT_TRACKER=y CONFIG_NETDEVSIM=m CONFIG_NET_DROP_MONITOR=y # CONFIG_NET_DSA is not set @@ -3370,7 +3371,7 @@ CONFIG_NETLINK_DIAG=y CONFIG_NET_MPLS_GSO=y # CONFIG_NET_NCSI is not set CONFIG_NET_NSH=y -# CONFIG_NET_NS_REFCNT_TRACKER is not set +CONFIG_NET_NS_REFCNT_TRACKER=y CONFIG_NET_NS=y CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y @@ -4271,6 +4272,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -4491,6 +4493,7 @@ CONFIG_SCHED_SMT=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_TRACER=y +# CONFIG_SCIF_BUS is not set CONFIG_SCOM_DEBUGFS=y # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_3W_SAS is not set @@ -6471,6 +6474,7 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_VMAP_STACK=y # CONFIG_VME_BUS is not set # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index a92fc144f..1764682ad 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4808,6 +4808,7 @@ CONFIG_REMOTEPROC=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -6990,7 +6991,7 @@ CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -7201,6 +7202,7 @@ CONFIG_VLAN_8021Q_MVRP=y # CONFIG_VMSPLIT_3G_OPT is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 9ee8da397..ac86fd2b4 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2175,6 +2175,7 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set +# CONFIG_INTEL_MIC_BUS is not set # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -4252,6 +4253,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -4472,6 +4474,7 @@ CONFIG_SCHED_SMT=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_TRACER=y +# CONFIG_SCIF_BUS is not set CONFIG_SCOM_DEBUGFS=y # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_3W_SAS is not set @@ -6450,6 +6453,7 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_VMAP_STACK=y # CONFIG_VME_BUS is not set # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 317a6651d..e86378ba1 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4773,6 +4773,7 @@ CONFIG_REMOTEPROC=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y # CONFIG_RFKILL is not set +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -6970,7 +6971,7 @@ CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -7187,6 +7188,7 @@ CONFIG_VMLOGRDR=m # CONFIG_VMSPLIT_3G_OPT is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 2be014f2f..1c3f90a3a 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2174,6 +2174,7 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set +# CONFIG_INTEL_MIC_BUS is not set # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -3234,7 +3235,7 @@ CONFIG_NET_CORE=y CONFIG_NETDEV_ADDR_LIST_TEST=m CONFIG_NETDEVICES=y CONFIG_NET_DEVLINK=y -# CONFIG_NET_DEV_REFCNT_TRACKER is not set +CONFIG_NET_DEV_REFCNT_TRACKER=y CONFIG_NETDEVSIM=m CONFIG_NET_DROP_MONITOR=y # CONFIG_NET_DSA is not set @@ -3352,7 +3353,7 @@ CONFIG_NETLINK_DIAG=y CONFIG_NET_MPLS_GSO=y # CONFIG_NET_NCSI is not set CONFIG_NET_NSH=y -# CONFIG_NET_NS_REFCNT_TRACKER is not set +CONFIG_NET_NS_REFCNT_TRACKER=y CONFIG_NET_NS=y CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y @@ -4211,6 +4212,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -4438,6 +4440,7 @@ CONFIG_SCHED_STACK_END_CHECK=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_TOPOLOGY=y CONFIG_SCHED_TRACER=y +# CONFIG_SCIF_BUS is not set CONFIG_SCLP_CONSOLE=y # CONFIG_SCLP_OFB is not set CONFIG_SCLP_TTY=y @@ -6429,6 +6432,7 @@ CONFIG_VMCP=y # CONFIG_VME_BUS is not set CONFIG_VMLOGRDR=m # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index f73730975..a7d3449ae 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4748,6 +4748,7 @@ CONFIG_REMOTEPROC=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y # CONFIG_RFKILL is not set +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -6943,7 +6944,7 @@ CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -7160,6 +7161,7 @@ CONFIG_VMLOGRDR=m # CONFIG_VMSPLIT_3G_OPT is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 497d3b908..3fb7e2552 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2158,6 +2158,7 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set +# CONFIG_INTEL_MIC_BUS is not set # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -4192,6 +4193,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -4419,6 +4421,7 @@ CONFIG_SCHED_STACK_END_CHECK=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_TOPOLOGY=y CONFIG_SCHED_TRACER=y +# CONFIG_SCIF_BUS is not set CONFIG_SCLP_CONSOLE=y # CONFIG_SCLP_OFB is not set CONFIG_SCLP_TTY=y @@ -6408,6 +6411,7 @@ CONFIG_VMCP=y # CONFIG_VME_BUS is not set CONFIG_VMLOGRDR=m # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 3b62adb04..e4453d217 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2170,6 +2170,7 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set # CONFIG_INTEL_MEI_TXE is not set +# CONFIG_INTEL_MIC_BUS is not set # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -4208,6 +4209,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y # CONFIG_RFKILL is not set +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -4438,6 +4440,7 @@ CONFIG_SCHED_STACK_END_CHECK=y # CONFIG_SCHEDSTATS is not set CONFIG_SCHED_TOPOLOGY=y CONFIG_SCHED_TRACER=y +# CONFIG_SCIF_BUS is not set CONFIG_SCLP_CONSOLE=y # CONFIG_SCLP_OFB is not set CONFIG_SCLP_TTY=y @@ -6436,6 +6439,7 @@ CONFIG_VMCP_CMA_SIZE=4 CONFIG_VM_EVENT_COUNTERS=y CONFIG_VMLOGRDR=m # CONFIG_VMXNET3 is not set +# CONFIG_VOP_BUS is not set CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m # CONFIG_VSOCKETS is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 667b759a5..08b0c3fdc 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2699,6 +2699,10 @@ CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_TXE=m CONFIG_INTEL_MEI_WDT=m # CONFIG_INTEL_MENLOW is not set +CONFIG_INTEL_MIC_BUS=m +CONFIG_INTEL_MIC_CARD=m +CONFIG_INTEL_MIC_HOST=m +CONFIG_INTEL_MIC_X100_DMA=m CONFIG_INTEL_MRFLD_ADC=m CONFIG_INTEL_MRFLD_PWRBTN=m CONFIG_INTEL_OAKTRAIL=m @@ -3606,6 +3610,7 @@ CONFIG_MHI_BUS_PCI_GENERIC=m CONFIG_MHI_NET=m CONFIG_MHI_WWAN_CTRL=m CONFIG_MHI_WWAN_MBIM=m +CONFIG_MIC_COSM=m # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m CONFIG_MICROCHIP_PHY=m @@ -5172,6 +5177,7 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -5423,6 +5429,8 @@ CONFIG_SCHED_STACK_END_CHECK=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_THERMAL_PRESSURE=y CONFIG_SCHED_TRACER=y +CONFIG_SCIF_BUS=m +CONFIG_SCIF=m CONFIG_SC_LPASS_CORECC_7180=m # CONFIG_SCR24X is not set CONFIG_SCSI_3W_9XXX=m @@ -7407,7 +7415,7 @@ CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -7631,6 +7639,8 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m +CONFIG_VOP_BUS=m +CONFIG_VOP=m CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 503038358..5cb2ee9c0 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2337,6 +2337,7 @@ CONFIG_INTEL_MEI_ME=m # CONFIG_INTEL_MEI_TXE is not set CONFIG_INTEL_MEI_WDT=m # CONFIG_INTEL_MENLOW is not set +# CONFIG_INTEL_MIC_BUS is not set CONFIG_INTEL_OAKTRAIL=m CONFIG_INTEL_PCH_THERMAL=m CONFIG_INTEL_PMC_CORE=m @@ -3432,7 +3433,7 @@ CONFIG_NET_CORE=y CONFIG_NETDEV_ADDR_LIST_TEST=m CONFIG_NETDEVICES=y CONFIG_NET_DEVLINK=y -# CONFIG_NET_DEV_REFCNT_TRACKER is not set +CONFIG_NET_DEV_REFCNT_TRACKER=y CONFIG_NETDEVSIM=m CONFIG_NET_DROP_MONITOR=y # CONFIG_NET_DSA is not set @@ -3549,7 +3550,7 @@ CONFIG_NETLINK_DIAG=y CONFIG_NET_MPLS_GSO=y # CONFIG_NET_NCSI is not set CONFIG_NET_NSH=y -# CONFIG_NET_NS_REFCNT_TRACKER is not set +CONFIG_NET_NS_REFCNT_TRACKER=y CONFIG_NET_NS=y CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y @@ -4442,6 +4443,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -4661,6 +4663,7 @@ CONFIG_SCHED_SMT=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_TRACER=y +# CONFIG_SCIF_BUS is not set # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_3W_SAS is not set CONFIG_SCSI_AACRAID=m @@ -6650,7 +6653,7 @@ CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_IOMMU is not set -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 @@ -6677,6 +6680,7 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m +# CONFIG_VOP_BUS is not set CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 12444fde5..30cf62d92 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2682,6 +2682,10 @@ CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_TXE=m CONFIG_INTEL_MEI_WDT=m # CONFIG_INTEL_MENLOW is not set +CONFIG_INTEL_MIC_BUS=m +CONFIG_INTEL_MIC_CARD=m +CONFIG_INTEL_MIC_HOST=m +CONFIG_INTEL_MIC_X100_DMA=m CONFIG_INTEL_MRFLD_ADC=m CONFIG_INTEL_MRFLD_PWRBTN=m CONFIG_INTEL_OAKTRAIL=m @@ -3583,6 +3587,7 @@ CONFIG_MHI_BUS_PCI_GENERIC=m CONFIG_MHI_NET=m CONFIG_MHI_WWAN_CTRL=m CONFIG_MHI_WWAN_MBIM=m +CONFIG_MIC_COSM=m # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m CONFIG_MICROCHIP_PHY=m @@ -5148,6 +5153,7 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -5399,6 +5405,8 @@ CONFIG_SCHED_STACK_END_CHECK=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_THERMAL_PRESSURE=y CONFIG_SCHED_TRACER=y +CONFIG_SCIF_BUS=m +CONFIG_SCIF=m CONFIG_SC_LPASS_CORECC_7180=m # CONFIG_SCR24X is not set CONFIG_SCSI_3W_9XXX=m @@ -7381,7 +7389,7 @@ CONFIG_VCNL3020=m # CONFIG_VCNL4000 is not set CONFIG_VCNL4035=m CONFIG_VDPA=m -# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM_BLOCK=m CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDPA_USER=m @@ -7605,6 +7613,8 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m +CONFIG_VOP_BUS=m +CONFIG_VOP=m CONFIG_VORTEX=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 92bb51451..b1abdf69b 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2321,6 +2321,7 @@ CONFIG_INTEL_MEI_ME=m # CONFIG_INTEL_MEI_TXE is not set CONFIG_INTEL_MEI_WDT=m # CONFIG_INTEL_MENLOW is not set +# CONFIG_INTEL_MIC_BUS is not set CONFIG_INTEL_OAKTRAIL=m CONFIG_INTEL_PCH_THERMAL=m CONFIG_INTEL_PMC_CORE=m @@ -4420,6 +4421,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set @@ -4639,6 +4641,7 @@ CONFIG_SCHED_SMT=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_TRACER=y +# CONFIG_SCIF_BUS is not set # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_3W_SAS is not set CONFIG_SCSI_AACRAID=m @@ -6626,7 +6629,7 @@ CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_IOMMU is not set -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 @@ -6653,6 +6656,7 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m +# CONFIG_VOP_BUS is not set CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m diff --git a/kernel.spec b/kernel.spec index 070933280..222235cc5 100755 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,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 @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc8.123 +%global distro_build 300 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.17.0 %define patchversion 5.17 -%define pkgrelease 0.rc8.123 +%define pkgrelease 300 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc8.123%{?buildid}%{?dist} +%define specrelease 300%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -185,7 +185,7 @@ Summary: The Linux kernel # Only build the debug kernel (--with dbgonly): %define with_dbgonly %{?_with_dbgonly: 1} %{?!_with_dbgonly: 0} # Control whether we perform a compat. check against published ABI. -%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1} +#%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1} # Temporarily disable kabi checks until RC. %define with_kabichk 0 # Control whether we perform a compat. check against DUP ABI. @@ -695,7 +695,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-rc8.tar.xz +Source0: linux-5.17.tar.xz Source1: Makefile.rhelver @@ -1391,8 +1391,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc8 -c -mv linux-5.17-rc8 linux-%{KVERREL} +%setup -q -n kernel-5.17 -c +mv linux-5.17 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2684,9 +2684,20 @@ fi\ %define kernel_modules_post() \ %{expand:%%post %{?1:%{1}-}modules}\ /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +if [ ! -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}} ]; then\ + mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\ + touch %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{?1:+%{1}}\ +fi\ %{nil}\ %{expand:%%postun %{?1:%{1}-}modules}\ /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +%{nil}\ +%{expand:%%posttrans %{?1:%{1}-}modules}\ +if [ -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{?1:+%{1}} ]; then\ + rm -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{?1:+%{1}}\ + echo "Running: dracut -f --kver %{KVERREL}%{?1:+%{1}}"\ + dracut -f --kver "%{KVERREL}%{?1:+%{1}}" || exit $?\ +fi\ %{nil} # This macro defines a %%posttrans script for a kernel package. @@ -2701,6 +2712,7 @@ then\ %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ fi\ %endif\ +rm -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}}\ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ %{nil} @@ -2721,6 +2733,8 @@ if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ] &&\ [ -f /etc/sysconfig/kernel ]; then\ /bin/sed -r -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\ fi}\ +mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\ +touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}}\ %{nil} # @@ -3005,8 +3019,46 @@ fi # # %changelog -* Mon Mar 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.123] -- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) +* Tue Mar 22 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17-300] +- Revert "PCI/MSI: Mask MSI-X vectors only on success" (Justin M. Forbes) +- Define SNAPSHOT correctly for VERSION_ON_UPSTREAM=0 (Justin M. Forbes) +- Config fixups after some RHEL specific patches were reverted (Justin M. Forbes) +- Basic Fedora Branch setup (Justin M. Forbes) +- Reset Makefile.rhelver for the 5.18 cycle (Justin M. Forbes) + +* Sat Mar 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.34e047aa16c0.124] +- Enable net reference count trackers in all debug kernels (Jiri Benc) +- redhat/Makefile: Reorganize variables (Prarit Bhargava) +- redhat/Makefile: Add some descriptions (Prarit Bhargava) +- redhat/Makefile: Move SNAPSHOT check (Prarit Bhargava) +- redhat/Makefile: Deprecate BREW_FLAGS, KOJI_FLAGS, and TEST_FLAGS (Prarit Bhargava) +- redhat/genspec.sh: Rework RPMVERSION variable (Prarit Bhargava) +- redhat/Makefile: Remove dead comment (Prarit Bhargava) +- redhat/Makefile: Cleanup KABI* variables. (Prarit Bhargava) +- redhat/Makefile.variables: Default RHGITCOMMIT to HEAD (Prarit Bhargava) +- redhat/scripts/create-tarball.sh: Use Makefile TARBALL variable (Prarit Bhargava) +- redhat/Makefile: Remove extra DIST_BRANCH (Prarit Bhargava) +- redhat/Makefile: Remove STAMP_VERSION (Prarit Bhargava) +- redhat/Makefile: Move NO_CONFIGCHECKS to Makefile.variables (Prarit Bhargava) +- redhat/Makefile: Move RHJOBS to Makefile.variables (Prarit Bhargava) +- redhat/Makefile: Move RHGIT* variables to Makefile.variables (Prarit Bhargava) +- redhat/Makefile: Move PREBUILD_GIT_ONLY to Makefile.variables (Prarit Bhargava) +- redhat/Makefile: Move BUILD to Makefile.variables (Prarit Bhargava) +- redhat/Makefile: Move BUILD_FLAGS to Makefile.variables. (Prarit Bhargava) +- redhat/Makefile: Move BUILD_PROFILE to Makefile.variables (Prarit Bhargava) +- redhat/Makefile: Move BUILD_TARGET and BUILD_SCRATCH_TARGET to Makefile.variables (Prarit Bhargava) +- redhat/Makefile: Remove RHPRODUCT variable (Prarit Bhargava) +- redhat/Makefile: Cleanup DISTRO variable (Prarit Bhargava) +- redhat/Makefile: Move HEAD to Makefile.variables. (Prarit Bhargava) +- redhat: Combine Makefile and Makefile.common (Prarit Bhargava) +- redhat/koji/Makefile: Decouple koji Makefile from Makefile.common (Prarit Bhargava) + +* Fri Mar 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.551acdc3c3d2.124] +- Set CONFIG_SND_SOC_SOF_MT8195 for Fedora and turn on VDPA_SIM_BLOCK (Justin M. Forbes) + +* Wed Mar 16 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.56e337f2cf13.123] +- Add asus_wmi_sensors modules to filters for Fedora (Justin M. Forbes) +- redhat: spec: trigger dracut when modules are installed separately (Jan Stancek) * Sat Mar 12 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc7.68453767131a.120] - Last of the Fedora 5.17 configs initial pass (Justin M. Forbes) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index e93144f31..894fa62e4 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -1,101 +1,51 @@ - Documentation/admin-guide/kernel-parameters.txt | 9 + Kconfig | 2 + - Kconfig.redhat | 17 + + Kconfig.redhat | 17 +++ Makefile | 12 +- 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 | 70 ++- - crypto/rng.c | 73 ++- - drivers/acpi/apei/hest.c | 8 + - drivers/acpi/irq.c | 17 +- - drivers/acpi/scan.c | 9 + - drivers/ata/libahci.c | 18 + - drivers/char/ipmi/ipmi_dmi.c | 15 + - drivers/char/ipmi/ipmi_msghandler.c | 16 +- - drivers/char/random.c | 115 +++++ + arch/x86/kernel/setup.c | 22 ++-- + crypto/rng.c | 73 +++++++++++- + drivers/acpi/apei/hest.c | 8 ++ + drivers/acpi/irq.c | 17 ++- + drivers/acpi/scan.c | 9 ++ + drivers/ata/libahci.c | 18 +++ + drivers/char/ipmi/ipmi_dmi.c | 15 +++ + drivers/char/ipmi/ipmi_msghandler.c | 16 ++- + drivers/char/random.c | 115 +++++++++++++++++++ drivers/firmware/efi/Makefile | 1 + - drivers/firmware/efi/efi.c | 124 +++-- - drivers/firmware/efi/secureboot.c | 38 ++ - drivers/hid/hid-rmi.c | 64 --- - 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/ethernet/intel/e1000/e1000_main.c | 2 + - drivers/net/team/team.c | 2 + - drivers/net/wireguard/main.c | 7 + - drivers/nvme/host/core.c | 22 +- - drivers/nvme/host/multipath.c | 19 +- + drivers/firmware/efi/efi.c | 124 +++++++++++++++------ + drivers/firmware/efi/secureboot.c | 38 +++++++ + drivers/hid/hid-rmi.c | 64 ----------- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ + drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- + drivers/iommu/iommu.c | 22 ++++ + 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 | 14 + - 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 + - drivers/virtio/virtio_mem.c | 13 + - fs/ext4/super.c | 5 + - fs/xfs/xfs_super.c | 5 + - include/linux/efi.h | 22 +- - include/linux/kernel.h | 19 + + drivers/pci/msi/msi.c | 12 +- + drivers/pci/quirks.c | 24 ++++ + drivers/usb/core/hub.c | 7 ++ + include/linux/efi.h | 22 ++-- include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hooks.h | 6 + - include/linux/mmzone.h | 4 +- include/linux/module.h | 1 + - include/linux/panic.h | 19 +- - include/linux/pci.h | 16 + - include/linux/random.h | 7 + - include/linux/rh_kabi.h | 515 +++++++++++++++++++++ + include/linux/random.h | 7 ++ include/linux/rmi.h | 1 + include/linux/security.h | 5 + init/Kconfig | 2 +- - kernel/Makefile | 1 + - kernel/bpf/syscall.c | 18 + kernel/module.c | 2 + kernel/module_signing.c | 9 +- - kernel/panic.c | 14 + - kernel/rh_messages.c | 179 +++++++ - kernel/sysctl.c | 5 + - mm/cma.c | 10 + - scripts/mod/modpost.c | 8 + + scripts/mod/modpost.c | 8 ++ scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- - security/lockdown/Kconfig | 13 + + security/lockdown/Kconfig | 13 +++ security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 76 files changed, 1744 insertions(+), 191 deletions(-) - -diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 7123524a86b8..9440625f58d5 100644 ---- a/Documentation/admin-guide/kernel-parameters.txt -+++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6004,6 +6004,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, + 46 files changed, 718 insertions(+), 196 deletions(-) + diff --git a/Kconfig b/Kconfig index 745bc773f567..f57ff40109d7 100644 --- a/Kconfig @@ -108,7 +58,7 @@ index 745bc773f567..f57ff40109d7 100644 +source "Kconfig.redhat" diff --git a/Kconfig.redhat b/Kconfig.redhat new file mode 100644 -index 000000000000..effb81d04bfd +index 000000000000..733a26bd887a --- /dev/null +++ b/Kconfig.redhat @@ -0,0 +1,17 @@ @@ -119,7 +69,7 @@ index 000000000000..effb81d04bfd + +menu "Red Hat options" + -+config RHEL_DIFFERENCES ++config RH_DISABLE_DEPRECATED + bool "Remove support for deprecated features" + help + Red Hat may choose to deprecate certain features in its kernels. @@ -130,7 +80,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 55a30ca69350..099a81cc56fd 100644 +index 7214f075e1f0..6ecb3acb605c 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -196,22 +146,6 @@ index c842878f8133..72949bfbe1af 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 e4dea8db6924..3f17c7b5bd78 100644 ---- a/arch/arm64/kernel/acpi.c -+++ b/arch/arm64/kernel/acpi.c -@@ -41,7 +41,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 3f8ee257f9aa..3ab92feb6241 100644 --- a/arch/s390/include/asm/ipl.h @@ -259,20 +193,8 @@ index 05327be3a982..c473e5ca67f1 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 7b8382c11788..4aa07bcf45cf 100644 ---- a/arch/x86/kernel/cpu/common.c -+++ b/arch/x86/kernel/cpu/common.c -@@ -1316,6 +1316,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 90d7e1788c91..9b2f902114b8 100644 +index 90d7e1788c91..262198c48162 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -20,6 +20,7 @@ @@ -283,67 +205,7 @@ index 90d7e1788c91..9b2f902114b8 100644 #include <linux/usb/xhci-dbgp.h> #include <linux/static_call.h> #include <linux/swiotlb.h> -@@ -51,6 +52,7 @@ - #include <asm/unwind.h> - #include <asm/vsyscall.h> - #include <linux/vmalloc.h> -+#include <asm/intel-family.h> - - /* - * max_low_pfn_mapped: highest directly mapped pfn < 4 GB -@@ -741,6 +743,51 @@ 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); -+ mark_hardware_unmaintained("x86 processor", "%s %s", 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. - */ -@@ -950,6 +997,13 @@ void __init setup_arch(char **cmdline_p) +@@ -950,6 +951,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -357,7 +219,7 @@ index 90d7e1788c91..9b2f902114b8 100644 dmi_setup(); /* -@@ -1119,19 +1173,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1119,19 +1127,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -378,15 +240,6 @@ index 90d7e1788c91..9b2f902114b8 100644 reserve_initrd(); -@@ -1244,6 +1286,8 @@ void __init setup_arch(char **cmdline_p) - efi_apply_memmap_quirks(); - #endif - -+ rh_check_supported(); -+ - unwind_init(); - } - diff --git a/crypto/rng.c b/crypto/rng.c index fea082b25fe4..50a9d040bed1 100644 --- a/crypto/rng.c @@ -547,7 +400,7 @@ index c68e694fca26..146cba5ae5bc 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 1331756d4cfc..4b5257f5e2c4 100644 +index 8b2e5ef15559..ac0291ef0838 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1769,6 +1769,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -852,7 +705,7 @@ index c02ff25dd477..d860f8eb9a81 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 7de3f5b6e8d0..95b1c35b347c 100644 +index 5502e176d51b..93b61ca552d6 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ @@ -1423,134 +1276,6 @@ index 107dcf5938d6..225a9797e39d 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 4acd8f9a48e1..57b430c4d814 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 acd4805dcf83..5f814d447ab3 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/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c -index 3f5feb55cfba..9d8cb34845b3 100644 ---- a/drivers/net/ethernet/intel/e1000/e1000_main.c -+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c -@@ -933,6 +933,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) - int bars, need_ioport; - bool disable_dev = false; - -+ pci_hw_unmaintained(e1000_pci_tbl, pdev); -+ - /* do not allocate ioport bars when not needed */ - need_ioport = e1000_is_need_ioport(pdev); - if (need_ioport) { -diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c -index 8b2adc56b92a..3263b33c9b69 100644 ---- a/drivers/net/team/team.c -+++ b/drivers/net/team/team.c -@@ -3045,6 +3045,8 @@ static int __init team_module_init(void) - if (err) - goto err_nl_init; - -+ mark_driver_deprecated(DRV_NAME); -+ - return 0; - - err_nl_init: -diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c -index ee4da9ab8013..0f217997a764 100644 ---- a/drivers/net/wireguard/main.c -+++ b/drivers/net/wireguard/main.c -@@ -12,6 +12,7 @@ - - #include <uapi/linux/wireguard.h> - -+#include <linux/fips.h> - #include <linux/init.h> - #include <linux/module.h> - #include <linux/genetlink.h> -@@ -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; -@@ -48,6 +54,7 @@ static int __init wg_mod_init(void) - pr_info("WireGuard " WIREGUARD_VERSION " loaded. See www.wireguard.com for information.\n"); - pr_info("Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.\n"); - -+ mark_tech_preview("WireGuard", THIS_MODULE); - return 0; - - err_netlink: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index fd4720d37cc0..c31bc05ec139 100644 --- a/drivers/nvme/host/core.c @@ -1687,102 +1412,36 @@ index a162f6c6da6e..0606205d5dcc 100644 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 588588cfda48..adb3a91b0ba3 100644 ---- a/drivers/pci/pci-driver.c -+++ b/drivers/pci/pci-driver.c -@@ -19,6 +19,7 @@ - #include <linux/kexec.h> - #include <linux/of_device.h> - #include <linux/acpi.h> -+#include <linux/kernel.h> - #include <linux/dma-map-ops.h> - #include "pci.h" - #include "pcie/portdrv.h" -@@ -295,6 +296,83 @@ static struct attribute *pci_drv_attrs[] = { - }; - ATTRIBUTE_GROUPS(pci_drv); +diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c +index 9037a7827eca..e5900638483b 100644 +--- a/drivers/pci/msi/msi.c ++++ b/drivers/pci/msi/msi.c +@@ -635,6 +635,9 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries, + goto out_disable; + } -+#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); ++ /* Ensure that all table entries are masked. */ ++ msix_mask_all(base, tsize); + -+ 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; + dev->msix_base = base; + + ret = msix_setup_interrupts(dev, base, entries, nvec, affd); +@@ -644,15 +647,6 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries, + /* Disable INTX */ + pci_intx_for_msi(dev, 0); + +- /* +- * Ensure that all table entries are masked to prevent +- * stale entries from firing in a crash kernel. +- * +- * Done late to deal with a broken Marvell NVME device +- * which takes the MSI-X mask bits into account even +- * when MSI-X is disabled, which prevents MSI delivery. +- */ +- msix_mask_all(base, tsize); + pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0); + + pcibios_free_irq(dev); diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 65f7f6b0576c..27398de38c0c 100644 --- a/drivers/pci/quirks.c @@ -1818,266 +1477,6 @@ index 65f7f6b0576c..27398de38c0c 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 a911252075a6..9bc69f6880f3 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 ab55681145f8..1f8b0f73597b 100644 ---- a/drivers/scsi/be2iscsi/be_main.c -+++ b/drivers/scsi/be2iscsi/be_main.c -@@ -372,11 +372,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 a47bcce3c9c7..094944a52866 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 6a90e6e53d09..7e48c3bf701d 100644 ---- a/drivers/scsi/lpfc/lpfc_ids.h -+++ b/drivers/scsi/lpfc/lpfc_ids.h -@@ -24,6 +24,7 @@ - #include <linux/pci.h> - - 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,14 +55,19 @@ 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, }, -+#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HORNET, - PCI_ANY_ID, PCI_ANY_ID, }, -+#endif - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP, -@@ -70,6 +76,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, -@@ -80,6 +87,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, -@@ -92,6 +100,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, -@@ -102,18 +111,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 82e1e24257bc..d256b02a5d2f 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 00792767c620..2ee890521ed7 100644 ---- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c -+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -@@ -12605,6 +12605,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 }, -@@ -12623,6 +12624,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 }, -@@ -12647,9 +12649,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 abcd30917263..3f0b22e61350 100644 ---- a/drivers/scsi/qla2xxx/qla_os.c -+++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -7937,6 +7937,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) }, -@@ -7949,13 +7950,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 0ae936d839f1..c7b3fe22e3e4 100644 ---- a/drivers/scsi/qla4xxx/ql4_os.c -+++ b/drivers/scsi/qla4xxx/ql4_os.c -@@ -9855,6 +9855,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, -@@ -9873,6 +9874,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 47a1c8bddf86..e309d992e2ad 100644 --- a/drivers/usb/core/hub.c @@ -2096,72 +1495,6 @@ index 47a1c8bddf86..e309d992e2ad 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/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c -index 38becd8d578c..f4ec685879cf 100644 ---- a/drivers/virtio/virtio_mem.c -+++ b/drivers/virtio/virtio_mem.c -@@ -2792,6 +2792,19 @@ static int virtio_mem_probe(struct virtio_device *vdev) - - /* trigger a config update to start processing the requested_size */ - if (!vm->in_kdump) { -+#ifdef CONFIG_RHEL_DIFFERENCES -+ static bool printed; -+ -+ /* -+ * virtio-mem, and especially its memory hot(un)plug -+ * functionality, is tech-preview. -+ */ -+ if (!printed) { -+ printed = true; -+ mark_tech_preview("virtio_mem", THIS_MODULE); -+ } -+#endif /* CONFIG_RHEL_DIFFERENCES */ -+ - atomic_set(&vm->config_changed, 1); - queue_work(system_freezable_wq, &vm->wq); - } -diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index c5021ca0a28a..b64257a6eebc 100644 ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -4760,6 +4760,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) - } - - if (sbi->s_mount_opt & EXT4_MOUNT_DAX_ALWAYS) { -+ static bool printed = false; - if (ext4_has_feature_inline_data(sb)) { - ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem" - " that may contain inline data"); -@@ -4770,6 +4771,10 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) - "DAX unsupported by block device."); - goto failed_mount; - } -+ if (!printed) { -+ mark_tech_preview("ext4 direct access (dax)", NULL); -+ printed = true; -+ } - } - - if (ext4_has_feature_encrypt(sb) && es->s_encryption_level) { -diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c -index d84714e4e46a..689297b7b003 100644 ---- a/fs/xfs/xfs_super.c -+++ b/fs/xfs/xfs_super.c -@@ -1602,9 +1602,14 @@ xfs_fs_fill_super( - sb->s_flags |= SB_I_VERSION; - - if (xfs_has_dax_always(mp)) { -+ static bool printed = false; - error = xfs_setup_dax_always(mp); - if (error) - goto out_filestream_unmount; -+ if (!printed) { -+ mark_tech_preview("xfs direct access (dax)", NULL); -+ printed = true; -+ } - } - - if (xfs_has_discard(mp)) { diff --git a/include/linux/efi.h b/include/linux/efi.h index ccd4d3f91c98..e64643e3e364 100644 --- a/include/linux/efi.h @@ -2230,34 +1563,6 @@ index ccd4d3f91c98..e64643e3e364 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 33f47a996513..7a716c0b05bc 100644 ---- a/include/linux/kernel.h -+++ b/include/linux/kernel.h -@@ -503,4 +503,23 @@ 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); -+#else -+static inline void mark_hardware_unsupported(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) { } -+#endif -+ - #endif diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h index 819ec92dc2a8..b49986bfbeca 100644 --- a/include/linux/lsm_hook_defs.h @@ -2288,23 +1593,6 @@ index 3bf5c658bc44..4701bc5ce2f5 100644 * Security hooks for perf events * * @perf_event_open: -diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h -index aed44e9b5d89..08517376c765 100644 ---- a/include/linux/mmzone.h -+++ b/include/linux/mmzone.h -@@ -1390,11 +1390,9 @@ static inline unsigned long *section_to_usemap(struct mem_section *ms) - static inline struct mem_section *__nr_to_section(unsigned long nr) - { - #ifdef CONFIG_SPARSEMEM_EXTREME -- if (!mem_section) -+ if (!*mem_section || !mem_section[SECTION_NR_TO_ROOT(nr)]) - return NULL; - #endif -- if (!mem_section[SECTION_NR_TO_ROOT(nr)]) -- return NULL; - return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK]; - } - extern size_t mem_section_usage_size(void); diff --git a/include/linux/module.h b/include/linux/module.h index 1e135fd5c076..6ec4d001c1e2 100644 --- a/include/linux/module.h @@ -2317,63 +1605,6 @@ index 1e135fd5c076..6ec4d001c1e2 100644 struct kobject *holders_dir; /* Exported symbols */ -diff --git a/include/linux/panic.h b/include/linux/panic.h -index f5844908a089..901d51012738 100644 ---- a/include/linux/panic.h -+++ b/include/linux/panic.h -@@ -74,7 +74,24 @@ static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout) - #define TAINT_LIVEPATCH 15 - #define TAINT_AUX 16 - #define TAINT_RANDSTRUCT 17 --#define TAINT_FLAGS_COUNT 18 -+/* Start of Red Hat-specific taint flags */ -+#define TAINT_18 18 -+#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_26 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 8253a5413d7c..8dcbd8f1700f 100644 ---- a/include/linux/pci.h -+++ b/include/linux/pci.h -@@ -1490,6 +1490,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/random.h b/include/linux/random.h index c45b2693e51f..4edfdb3e44a9 100644 --- a/include/linux/random.h @@ -2399,527 +1630,6 @@ index c45b2693e51f..4edfdb3e44a9 100644 #ifndef MODULE extern const struct file_operations random_fops, urandom_fops; -diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h -new file mode 100644 -index 000000000000..c7b42c1f1681 ---- /dev/null -+++ b/include/linux/rh_kabi.h -@@ -0,0 +1,515 @@ -+/* -+ * rh_kabi.h - Red Hat kABI abstraction header -+ * -+ * Copyright (c) 2014 Don Zickus -+ * Copyright (c) 2015-2020 Jiri Benc -+ * Copyright (c) 2015 Sabrina Dubroca, Hannes Frederic Sowa -+ * Copyright (c) 2016-2018 Prarit Bhargava -+ * Copyright (c) 2017 Paolo Abeni, Larry Woodman -+ * -+ * This file is released under the GPLv2. -+ * See the file COPYING for more details. -+ * -+ * These kabi macros hide the changes from the kabi checker and from the -+ * process that computes the exported symbols' checksums. -+ * They have 2 variants: one (defined under __GENKSYMS__) used when -+ * generating the checksums, and the other used when building the kernel's -+ * binaries. -+ * -+ * The use of these macros does not guarantee that the usage and modification -+ * of code is correct. As with all Red Hat only changes, an engineer must -+ * explain why the use of the macro is valid in the patch containing the -+ * changes. -+ * -+ */ -+ -+#ifndef _LINUX_RH_KABI_H -+#define _LINUX_RH_KABI_H -+ -+#include <linux/kconfig.h> -+#include <linux/compiler.h> -+#include <linux/stringify.h> -+ -+/* -+ * NOTE -+ * Unless indicated otherwise, don't use ';' after these macros as it -+ * messes up the kABI checker by changing what the resulting token string -+ * looks like. Instead let the macros add the ';' so it can be properly -+ * hidden from the kABI checker (mainly for RH_KABI_EXTEND, but applied to -+ * most macros for uniformity). -+ * -+ * -+ * RH_KABI_CONST -+ * Adds a new const modifier to a function parameter preserving the old -+ * checksum. -+ * -+ * RH_KABI_ADD_MODIFIER -+ * Adds a new modifier to a function parameter or a typedef, preserving -+ * the old checksum. Useful e.g. for adding rcu annotations or changing -+ * int to unsigned. Beware that this may change the semantics; if you're -+ * sure this is safe, always explain why binary compatibility with 3rd -+ * party modules is retained. -+ * -+ * RH_KABI_DEPRECATE -+ * Marks the element as deprecated and make it unusable by modules while -+ * keeping a hole in its place to preserve binary compatibility. -+ * -+ * RH_KABI_DEPRECATE_FN -+ * Marks the function pointer as deprecated and make it unusable by modules -+ * while keeping a hole in its place to preserve binary compatibility. -+ * -+ * RH_KABI_EXTEND -+ * Adds a new field to a struct. This must always be added to the end of -+ * the struct. Before using this macro, make sure this is actually safe -+ * to do - there is a number of conditions under which it is *not* safe. -+ * In particular (but not limited to), this macro cannot be used: -+ * - if the struct in question is embedded in another struct, or -+ * - if the struct is allocated by drivers either statically or -+ * dynamically, or -+ * - if the struct is allocated together with driver data (an example of -+ * such behavior is struct net_device or struct request). -+ * -+ * RH_KABI_EXTEND_WITH_SIZE -+ * Adds a new element (usually a struct) to a struct and reserves extra -+ * space for the new element. The provided 'size' is the total space to -+ * be added in longs (i.e. it's 8 * 'size' bytes), including the size of -+ * the added element. It is automatically checked that the new element -+ * does not overflow the reserved space, now nor in the future. However, -+ * no attempt is done to check the content of the added element (struct) -+ * for kABI conformance - kABI checking inside the added element is -+ * effectively switched off. -+ * For any struct being added by RH_KABI_EXTEND_WITH_SIZE, it is -+ * recommended its content to be documented as not covered by kABI -+ * guarantee. -+ * -+ * RH_KABI_FILL_HOLE -+ * Fills a hole in a struct. -+ * -+ * Warning: only use if a hole exists for _all_ arches. Use pahole to verify. -+ * -+ * RH_KABI_RENAME -+ * Renames an element without changing its type. This macro can be used in -+ * bitfields, for example. -+ * -+ * NOTE: this macro does not add the final ';' -+ * -+ * RH_KABI_REPLACE -+ * Replaces the _orig field by the _new field. The size of the occupied -+ * space is preserved, it's fine if the _new field is smaller than the -+ * _orig field. If a _new field is larger or has a different alignment, -+ * compilation will abort. -+ * -+ * RH_KABI_REPLACE_SPLIT -+ * Works the same as RH_KABI_REPLACE but replaces a single _orig field by -+ * multiple new fields. The checks for size and alignment done by -+ * RH_KABI_REPLACE are still applied. -+ * -+ * RH_KABI_HIDE_INCLUDE -+ * Hides the given include file from kABI checksum computations. This is -+ * used when a newly added #include makes a previously opaque struct -+ * visible. -+ * -+ * Example usage: -+ * #include RH_KABI_HIDE_INCLUDE(<linux/poll.h>) -+ * -+ * RH_KABI_FAKE_INCLUDE -+ * Pretends inclusion of the given file for kABI checksum computations. -+ * This is used when upstream removed a particular #include but that made -+ * some structures opaque that were previously visible and is causing kABI -+ * checker failures. -+ * -+ * Example usage: -+ * #include RH_KABI_FAKE_INCLUDE(<linux/rhashtable.h>) -+ * -+ * RH_KABI_RESERVE -+ * Adds a reserved field to a struct. This is done prior to kABI freeze -+ * for structs that cannot be expanded later using RH_KABI_EXTEND (for -+ * example because they are embedded in another struct or because they are -+ * allocated by drivers or because they use unusual memory layout). The -+ * size of the reserved field is 'unsigned long' and is assumed to be -+ * 8 bytes. -+ * -+ * The argument is a number unique for the given struct; usually, multiple -+ * RH_KABI_RESERVE macros are added to a struct with numbers starting from -+ * one. -+ * -+ * Example usage: -+ * struct foo { -+ * int a; -+ * RH_KABI_RESERVE(1) -+ * RH_KABI_RESERVE(2) -+ * RH_KABI_RESERVE(3) -+ * RH_KABI_RESERVE(4) -+ * }; -+ * -+ * RH_KABI_USE -+ * Uses a previously reserved field or multiple fields. The arguments are -+ * one or more numbers assigned to RH_KABI_RESERVE, followed by a field to -+ * be put in their place. The compiler ensures that the new field is not -+ * larger than the reserved area. -+ * -+ * Example usage: -+ * struct foo { -+ * int a; -+ * RH_KABI_USE(1, int b) -+ * RH_KABI_USE(2, 3, int c[3]) -+ * RH_KABI_RESERVE(4) -+ * }; -+ * -+ * RH_KABI_USE_SPLIT -+ * Works the same as RH_KABI_USE but replaces a single reserved field by -+ * multiple new fields. -+ * -+ * RH_KABI_AUX_EMBED -+ * RH_KABI_AUX_PTR -+ * Adds an extenstion of a struct in the form of "auxiliary structure". -+ * This is done prior to kABI freeze for structs that cannot be expanded -+ * later using RH_KABI_EXTEND. See also RH_KABI_RESERVED, these two -+ * approaches can (and often are) combined. -+ * -+ * To use this for 'struct foo' (the "base structure"), define a new -+ * structure called 'struct foo_rh'; this new struct is called "auxiliary -+ * structure". Then add RH_KABI_AUX_EMBED or RH_KABI_AUX_PTR to the end -+ * of the base structure. The argument is the name of the base structure, -+ * without the 'struct' keyword. -+ * -+ * RH_KABI_AUX_PTR stores a pointer to the aux structure in the base -+ * struct. The lifecycle of the aux struct needs to be properly taken -+ * care of. -+ * -+ * RH_KABI_AUX_EMBED embeds the aux struct into the base struct. This -+ * cannot be used when the base struct is itself embedded into another -+ * struct, allocated in an array, etc. -+ * -+ * Both approaches (ptr and embed) work correctly even when the aux struct -+ * is allocated by modules. To ensure this, the code responsible for -+ * allocation/assignment of the aux struct has to properly set the size of -+ * the aux struct; see the RH_KABI_AUX_SET_SIZE and RH_KABI_AUX_INIT_SIZE -+ * macros. -+ * -+ * New fields can be later added to the auxiliary structure, always to its -+ * end. Note the auxiliary structure cannot be shrunk in size later (i.e., -+ * fields cannot be removed, only deprecated). Any code accessing fields -+ * from the aux struct must guard the access using the RH_KABI_AUX macro. -+ * The access itself is then done via a '_rh' field in the base struct. -+ * -+ * The auxiliary structure is not guaranteed for access by modules unless -+ * explicitly commented as such in the declaration of the aux struct -+ * itself or some of its elements. -+ * -+ * Example: -+ * -+ * struct foo_rh { -+ * int newly_added; -+ * }; -+ * -+ * struct foo { -+ * bool big_hammer; -+ * RH_KABI_AUX_PTR(foo) -+ * }; -+ * -+ * void use(struct foo *f) -+ * { -+ * if (RH_KABI_AUX(f, foo, newly_added)) -+ * f->_rh->newly_added = 123; -+ * else -+ * // the field 'newly_added' is not present in the passed -+ * // struct, fall back to old behavior -+ * f->big_hammer = true; -+ * } -+ * -+ * static struct foo_rh my_foo_rh { -+ * .newly_added = 0; -+ * } -+ * -+ * static struct foo my_foo = { -+ * .big_hammer = false, -+ * ._rh = &my_foo_rh, -+ * RH_KABI_AUX_INIT_SIZE(foo) -+ * }; -+ * -+ * RH_KABI_USE_AUX_PTR -+ * Creates an auxiliary structure post kABI freeze. This works by using -+ * two reserved fields (thus there has to be two reserved fields still -+ * available) and converting them to RH_KABI_AUX_PTR. -+ * -+ * Example: -+ * -+ * struct foo_rh { -+ * }; -+ * -+ * struct foo { -+ * int a; -+ * RH_KABI_RESERVE(1) -+ * RH_KABI_USE_AUX_PTR(2, 3, foo) -+ * }; -+ * -+ * RH_KABI_AUX_SET_SIZE -+ * RH_KABI_AUX_INIT_SIZE -+ * Calculates and stores the size of the auxiliary structure. -+ * -+ * RH_KABI_AUX_SET_SIZE is for dynamically allocated base structs, -+ * RH_KABI_AUX_INIT_SIZE is for statically allocated case structs. -+ * -+ * These macros must be called from the allocation (RH_KABI_AUX_SET_SIZE) -+ * or declaration (RH_KABI_AUX_INIT_SIZE) site, regardless of whether -+ * that happens in the kernel or in a module. Without calling one of -+ * these macros, the aux struct will appear to have no fields to the -+ * kernel. -+ * -+ * Note: since RH_KABI_AUX_SET_SIZE is intended to be invoked outside of -+ * a struct definition, it does not add the semicolon and must be -+ * terminated by semicolon by the caller. -+ * -+ * RH_KABI_AUX -+ * Verifies that the given field exists in the given auxiliary structure. -+ * This MUST be called prior to accessing that field; failing to do that -+ * may lead to invalid memory access. -+ * -+ * The first argument is a pointer to the base struct, the second argument -+ * is the name of the base struct (without the 'struct' keyword), the -+ * third argument is the field name. -+ * -+ * This macro works for structs extended by either of RH_KABI_AUX_EMBED, -+ * RH_KABI_AUX_PTR and RH_KABI_USE_AUX_PTR. -+ * -+ * RH_KABI_FORCE_CHANGE -+ * Force change of the symbol checksum. The argument of the macro is a -+ * version for cases we need to do this more than once. -+ * -+ * This macro does the opposite: it changes the symbol checksum without -+ * actually changing anything about the exported symbol. It is useful for -+ * symbols that are not whitelisted, we're changing them in an -+ * incompatible way and want to prevent 3rd party modules to silently -+ * corrupt memory. Instead, by changing the symbol checksum, such modules -+ * won't be loaded by the kernel. This macro should only be used as a -+ * last resort when all other KABI workarounds have failed. -+ * -+ * RH_KABI_EXCLUDE -+ * !!! WARNING: DANGEROUS, DO NOT USE unless you are aware of all the !!! -+ * !!! implications. This should be used ONLY EXCEPTIONALLY and only !!! -+ * !!! under specific circumstances. Very likely, this macro does not !!! -+ * !!! do what you expect it to do. Note that any usage of this macro !!! -+ * !!! MUST be paired with a RH_KABI_FORCE_CHANGE annotation of !!! -+ * !!! a suitable symbol (or an equivalent safeguard) and the commit !!! -+ * !!! log MUST explain why the chosen solution is appropriate. !!! -+ * -+ * Exclude the element from checksum generation. Any such element is -+ * considered not to be part of the kABI whitelist and may be changed at -+ * will. Note however that it's the responsibility of the developer -+ * changing the element to ensure 3rd party drivers using this element -+ * won't panic, for example by not allowing them to be loaded. That can -+ * be achieved by changing another, non-whitelisted symbol they use, -+ * either by nature of the change or by using RH_KABI_FORCE_CHANGE. -+ * -+ * Also note that any change to the element must preserve its size. Change -+ * of the size is not allowed and would constitute a silent kABI breakage. -+ * Beware that the RH_KABI_EXCLUDE macro does not do any size checks. -+ * -+ * RH_KABI_BROKEN_INSERT -+ * RH_KABI_BROKEN_REMOVE -+ * Insert a field to the middle of a struct / delete a field from a struct. -+ * Note that this breaks kABI! It can be done only when it's certain that -+ * no 3rd party driver can validly reach into the struct. A typical -+ * example is a struct that is: both (a) referenced only through a long -+ * chain of pointers from another struct that is part of a whitelisted -+ * symbol and (b) kernel internal only, it should have never been visible -+ * to genksyms in the first place. -+ * -+ * Another example are structs that are explicitly exempt from kABI -+ * guarantee but we did not have enough foresight to use RH_KABI_EXCLUDE. -+ * In this case, the warning for RH_KABI_EXCLUDE applies. -+ * -+ * A detailed explanation of correctness of every RH_KABI_BROKEN_* macro -+ * use is especially important. -+ * -+ * RH_KABI_BROKEN_INSERT_BLOCK -+ * RH_KABI_BROKEN_REMOVE_BLOCK -+ * A version of RH_KABI_BROKEN_INSERT / REMOVE that allows multiple fields -+ * to be inserted or removed together. All fields need to be terminated -+ * by ';' inside(!) the macro parameter. The macro itself must not be -+ * terminated by ';'. -+ * -+ * RH_KABI_BROKEN_REPLACE -+ * Replace a field by a different one without doing any checking. This -+ * allows replacing a field by another with a different size. Similarly -+ * to other RH_KABI_BROKEN macros, use of this indicates a kABI breakage. -+ * -+ * RH_KABI_BROKEN_INSERT_ENUM -+ * RH_KABI_BROKEN_REMOVE_ENUM -+ * Insert a field to the middle of an enumaration type / delete a field from -+ * an enumaration type. Note that this can break kABI especially if the -+ * number of enum fields is used in an array within a structure. It can be -+ * done only when it is certain that no 3rd party driver will use the -+ * enumeration type or a structure that embeds an array with size determined -+ * by an enumeration type. -+ * -+ * RH_KABI_EXTEND_ENUM -+ * Adds a new field to an enumeration type. This must always be added to -+ * the end of the enum. Before using this macro, make sure this is actually -+ * safe to do. -+ */ -+ -+#undef linux -+#define linux linux -+ -+#ifdef __GENKSYMS__ -+ -+# define RH_KABI_CONST -+# define RH_KABI_ADD_MODIFIER(_new) -+# define RH_KABI_EXTEND(_new) -+# define RH_KABI_FILL_HOLE(_new) -+# define RH_KABI_FORCE_CHANGE(ver) __attribute__((rh_kabi_change ## ver)) -+# define RH_KABI_RENAME(_orig, _new) _orig -+# define RH_KABI_HIDE_INCLUDE(_file) <linux/rh_kabi.h> -+# define RH_KABI_FAKE_INCLUDE(_file) _file -+# define RH_KABI_BROKEN_INSERT(_new) -+# define RH_KABI_BROKEN_REMOVE(_orig) _orig; -+# define RH_KABI_BROKEN_INSERT_BLOCK(_new) -+# define RH_KABI_BROKEN_REMOVE_BLOCK(_orig) _orig -+# define RH_KABI_BROKEN_REPLACE(_orig, _new) _orig; -+# define RH_KABI_BROKEN_INSERT_ENUM(_new) -+# define RH_KABI_BROKEN_REMOVE_ENUM(_orig) _orig, -+# define RH_KABI_EXTEND_ENUM(_new) -+ -+# define _RH_KABI_DEPRECATE(_type, _orig) _type _orig -+# define _RH_KABI_DEPRECATE_FN(_type, _orig, _args...) _type (*_orig)(_args) -+# define _RH_KABI_REPLACE(_orig, _new) _orig -+# define _RH_KABI_EXCLUDE(_elem) -+ -+#else -+ -+# define RH_KABI_ALIGN_WARNING ". Disable CONFIG_RH_KABI_SIZE_ALIGN_CHECKS if debugging." -+ -+# define RH_KABI_CONST const -+# define RH_KABI_ADD_MODIFIER(_new) _new -+# define RH_KABI_EXTEND(_new) _new; -+# define RH_KABI_FILL_HOLE(_new) _new; -+# define RH_KABI_FORCE_CHANGE(ver) -+# define RH_KABI_RENAME(_orig, _new) _new -+# define RH_KABI_HIDE_INCLUDE(_file) _file -+# define RH_KABI_FAKE_INCLUDE(_file) <linux/rh_kabi.h> -+# define RH_KABI_BROKEN_INSERT(_new) _new; -+# define RH_KABI_BROKEN_REMOVE(_orig) -+# define RH_KABI_BROKEN_INSERT_BLOCK(_new) _new -+# define RH_KABI_BROKEN_REMOVE_BLOCK(_orig) -+# define RH_KABI_BROKEN_REPLACE(_orig, _new) _new; -+# define RH_KABI_BROKEN_INSERT_ENUM(_new) _new, -+# define RH_KABI_BROKEN_REMOVE_ENUM(_orig) -+# define RH_KABI_EXTEND_ENUM(_new) _new, -+ -+#if IS_BUILTIN(CONFIG_RH_KABI_SIZE_ALIGN_CHECKS) -+# define __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new) \ -+ union { \ -+ _Static_assert(sizeof(struct{_new;}) <= sizeof(struct{_orig;}), \ -+ __FILE__ ":" __stringify(__LINE__) ": " __stringify(_new) " is larger than " __stringify(_orig) RH_KABI_ALIGN_WARNING); \ -+ _Static_assert(__alignof__(struct{_new;}) <= __alignof__(struct{_orig;}), \ -+ __FILE__ ":" __stringify(__LINE__) ": " __stringify(_orig) " is not aligned the same as " __stringify(_new) RH_KABI_ALIGN_WARNING); \ -+ } -+# define __RH_KABI_CHECK_SIZE(_item, _size) \ -+ _Static_assert(sizeof(struct{_item;}) <= _size, \ -+ __FILE__ ":" __stringify(__LINE__) ": " __stringify(_item) " is larger than the reserved size (" __stringify(_size) " bytes)" RH_KABI_ALIGN_WARNING) -+#else -+# define __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new) -+# define __RH_KABI_CHECK_SIZE(_item, _size) -+#endif -+ -+#define RH_KABI_UNIQUE_ID __PASTE(rh_kabi_hidden_, __LINE__) -+ -+# define _RH_KABI_DEPRECATE(_type, _orig) _type rh_reserved_##_orig -+# define _RH_KABI_DEPRECATE_FN(_type, _orig, _args...) \ -+ _type (* rh_reserved_##_orig)(_args) -+# define _RH_KABI_REPLACE(_orig, _new) \ -+ union { \ -+ _new; \ -+ struct { \ -+ _orig; \ -+ } RH_KABI_UNIQUE_ID; \ -+ __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new); \ -+ } -+ -+# define _RH_KABI_EXCLUDE(_elem) _elem -+ -+#endif /* __GENKSYMS__ */ -+ -+# define RH_KABI_DEPRECATE(_type, _orig) _RH_KABI_DEPRECATE(_type, _orig); -+# define RH_KABI_DEPRECATE_FN(_type, _orig, _args...) \ -+ _RH_KABI_DEPRECATE_FN(_type, _orig, _args); -+# define RH_KABI_REPLACE(_orig, _new) _RH_KABI_REPLACE(_orig, _new); -+ -+#define _RH_KABI_REPLACE1(_new) _new; -+#define _RH_KABI_REPLACE2(_new, ...) _new; _RH_KABI_REPLACE1(__VA_ARGS__) -+#define _RH_KABI_REPLACE3(_new, ...) _new; _RH_KABI_REPLACE2(__VA_ARGS__) -+#define _RH_KABI_REPLACE4(_new, ...) _new; _RH_KABI_REPLACE3(__VA_ARGS__) -+#define _RH_KABI_REPLACE5(_new, ...) _new; _RH_KABI_REPLACE4(__VA_ARGS__) -+#define _RH_KABI_REPLACE6(_new, ...) _new; _RH_KABI_REPLACE5(__VA_ARGS__) -+#define _RH_KABI_REPLACE7(_new, ...) _new; _RH_KABI_REPLACE6(__VA_ARGS__) -+#define _RH_KABI_REPLACE8(_new, ...) _new; _RH_KABI_REPLACE7(__VA_ARGS__) -+#define _RH_KABI_REPLACE9(_new, ...) _new; _RH_KABI_REPLACE8(__VA_ARGS__) -+#define _RH_KABI_REPLACE10(_new, ...) _new; _RH_KABI_REPLACE9(__VA_ARGS__) -+#define _RH_KABI_REPLACE11(_new, ...) _new; _RH_KABI_REPLACE10(__VA_ARGS__) -+#define _RH_KABI_REPLACE12(_new, ...) _new; _RH_KABI_REPLACE11(__VA_ARGS__) -+ -+#define RH_KABI_REPLACE_SPLIT(_orig, ...) _RH_KABI_REPLACE(_orig, \ -+ struct { __PASTE(_RH_KABI_REPLACE, COUNT_ARGS(__VA_ARGS__))(__VA_ARGS__) }); -+ -+# define RH_KABI_RESERVE(n) _RH_KABI_RESERVE(n); -+ -+#define _RH_KABI_USE1(n, _new) _RH_KABI_RESERVE(n), _new -+#define _RH_KABI_USE2(n, ...) _RH_KABI_RESERVE(n); _RH_KABI_USE1(__VA_ARGS__) -+#define _RH_KABI_USE3(n, ...) _RH_KABI_RESERVE(n); _RH_KABI_USE2(__VA_ARGS__) -+#define _RH_KABI_USE4(n, ...) _RH_KABI_RESERVE(n); _RH_KABI_USE3(__VA_ARGS__) -+#define _RH_KABI_USE5(n, ...) _RH_KABI_RESERVE(n); _RH_KABI_USE4(__VA_ARGS__) -+#define _RH_KABI_USE6(n, ...) _RH_KABI_RESERVE(n); _RH_KABI_USE5(__VA_ARGS__) -+#define _RH_KABI_USE7(n, ...) _RH_KABI_RESERVE(n); _RH_KABI_USE6(__VA_ARGS__) -+#define _RH_KABI_USE8(n, ...) _RH_KABI_RESERVE(n); _RH_KABI_USE7(__VA_ARGS__) -+#define _RH_KABI_USE9(n, ...) _RH_KABI_RESERVE(n); _RH_KABI_USE8(__VA_ARGS__) -+#define _RH_KABI_USE10(n, ...) _RH_KABI_RESERVE(n); _RH_KABI_USE9(__VA_ARGS__) -+#define _RH_KABI_USE11(n, ...) _RH_KABI_RESERVE(n); _RH_KABI_USE10(__VA_ARGS__) -+#define _RH_KABI_USE12(n, ...) _RH_KABI_RESERVE(n); _RH_KABI_USE11(__VA_ARGS__) -+ -+#define _RH_KABI_USE(...) _RH_KABI_REPLACE(__VA_ARGS__) -+#define RH_KABI_USE(n, ...) _RH_KABI_USE(__PASTE(_RH_KABI_USE, COUNT_ARGS(__VA_ARGS__))(n, __VA_ARGS__)); -+ -+# define RH_KABI_USE_SPLIT(n, ...) RH_KABI_REPLACE_SPLIT(_RH_KABI_RESERVE(n), __VA_ARGS__) -+ -+# define _RH_KABI_RESERVE(n) unsigned long rh_reserved##n -+ -+#define RH_KABI_EXCLUDE(_elem) _RH_KABI_EXCLUDE(_elem); -+ -+#define RH_KABI_EXTEND_WITH_SIZE(_new, _size) \ -+ RH_KABI_EXTEND(union { \ -+ _new; \ -+ unsigned long RH_KABI_UNIQUE_ID[_size]; \ -+ __RH_KABI_CHECK_SIZE(_new, 8 * (_size)); \ -+ }) -+ -+#define _RH_KABI_AUX_PTR(_struct) \ -+ size_t _struct##_size_rh; \ -+ _RH_KABI_EXCLUDE(struct _struct##_rh *_rh) -+#define RH_KABI_AUX_PTR(_struct) \ -+ _RH_KABI_AUX_PTR(_struct); -+ -+#define _RH_KABI_AUX_EMBED(_struct) \ -+ size_t _struct##_size_rh; \ -+ _RH_KABI_EXCLUDE(struct _struct##_rh _rh) -+#define RH_KABI_AUX_EMBED(_struct) \ -+ _RH_KABI_AUX_EMBED(_struct); -+ -+#define RH_KABI_USE_AUX_PTR(n1, n2, _struct) \ -+ RH_KABI_USE(n1, n2, \ -+ struct { RH_KABI_AUX_PTR(_struct) }) -+ -+#define RH_KABI_AUX_SET_SIZE(_name, _struct) ({ \ -+ (_name)->_struct##_size_rh = sizeof(struct _struct##_rh); \ -+}) -+ -+#define RH_KABI_AUX_INIT_SIZE(_struct) \ -+ ._struct##_size_rh = sizeof(struct _struct##_rh), -+ -+#define RH_KABI_AUX(_ptr, _struct, _field) ({ \ -+ size_t __off = offsetof(struct _struct##_rh, _field); \ -+ (_ptr)->_struct##_size_rh > __off ? true : false; \ -+}) -+ -+#endif /* _LINUX_RH_KABI_H */ diff --git a/include/linux/rmi.h b/include/linux/rmi.h index ab7eea01ab42..fff7c5f737fc 100644 --- a/include/linux/rmi.h @@ -2968,54 +1678,6 @@ index e9119bf54b1f..e3b57b4898fe 100644 select IO_WQ default y help -diff --git a/kernel/Makefile b/kernel/Makefile -index 56f4ee97f328..2dfcaac71418 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 ca70fe6fba38..b723094f3284 100644 ---- a/kernel/bpf/syscall.c -+++ b/kernel/bpf/syscall.c -@@ -25,6 +25,7 @@ - #include <linux/ctype.h> - #include <linux/nospec.h> - #include <linux/audit.h> -+#include <linux/init.h> - #include <uapi/linux/btf.h> - #include <linux/pgtable.h> - #include <linux/bpf_lsm.h> -@@ -51,6 +52,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; - diff --git a/kernel/module.c b/kernel/module.c index 46a5c2ed1928..92c2306651ce 100644 --- a/kernel/module.c @@ -3057,260 +1719,6 @@ index 8723ae70ea1f..fb2d773498c2 100644 + } + return ret; } -diff --git a/kernel/panic.c b/kernel/panic.c -index 55b50e052ec3..8b7955251793 100644 ---- a/kernel/panic.c -+++ b/kernel/panic.c -@@ -385,6 +385,20 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { - [ TAINT_LIVEPATCH ] = { 'K', ' ', true }, - [ TAINT_AUX ] = { 'X', ' ', true }, - [ TAINT_RANDSTRUCT ] = { 'T', ' ', true }, -+ [ TAINT_18 ] = { '?', '-', false }, -+ [ TAINT_19 ] = { '?', '-', false }, -+ [ TAINT_20 ] = { '?', '-', false }, -+ [ TAINT_21 ] = { '?', '-', false }, -+ [ TAINT_22 ] = { '?', '-', false }, -+ [ TAINT_23 ] = { '?', '-', false }, -+ [ TAINT_24 ] = { '?', '-', false }, -+ [ TAINT_25 ] = { '?', '-', false }, -+ [ TAINT_26 ] = { '?', '-', false }, -+ [ 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..345a979cd0e4 ---- /dev/null -+++ b/kernel/rh_messages.c -@@ -0,0 +1,179 @@ -+#include <linux/kernel.h> -+#include <linux/module.h> -+ -+#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 && mod->name) -+ 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); -diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 730ab56d9e92..df217c4ed071 100644 ---- a/kernel/sysctl.c -+++ b/kernel/sysctl.c -@@ -199,6 +199,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/mm/cma.c b/mm/cma.c -index bc9ca8f3c487..9fa9a485eb3a 100644 ---- a/mm/cma.c -+++ b/mm/cma.c -@@ -125,6 +125,12 @@ static void __init cma_activate_area(struct cma *cma) - spin_lock_init(&cma->mem_head_lock); - #endif - -+#ifdef CONFIG_RHEL_DIFFERENCES -+ /* s390x and ppc64 has been using CMA already in RHEL 8 as default. */ -+ if (!IS_ENABLED(CONFIG_S390) && !IS_ENABLED(CONFIG_PPC64)) -+ mark_tech_preview("CMA", NULL); -+#endif /* CONFIG_RHEL_DIFFERENCES */ -+ - return; - - not_in_zone: -@@ -437,6 +443,10 @@ struct page *cma_alloc(struct cma *cma, unsigned long count, - if (!cma || !cma->count || !cma->bitmap) - goto out; - -+#ifdef CONFIG_RHEL_DIFFERENCES -+ pr_info_once("Initial CMA usage detected\n"); -+#endif /* CONFIG_RHEL_DIFFERENCES */ -+ - pr_debug("%s(cma %p, count %lu, align %d)\n", __func__, (void *)cma, - count, align); - diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 6bfa33217914..92d936f34b27 100644 --- a/scripts/mod/modpost.c diff --git a/process_configs.sh b/process_configs.sh index 376f79584..2ee4037ad 100755 --- a/process_configs.sh +++ b/process_configs.sh @@ -388,16 +388,15 @@ done PACKAGE_NAME="${1:-kernel}" # defines the package name used KVERREL="$(test -n "$2" && echo "-$2" || echo "")" SUBARCH="$(test -n "$3" && echo "-$3" || echo "")" -FLAVOR="$(test -n "$4" && echo "-$4" || echo "-common")" +FLAVOR="$(test -n "$4" && echo "-$4" || echo "-ark")" RHJOBS="$(test -n "$5" && echo "$5" || nproc --all)" SCRIPT=$(readlink -f "$0") SCRIPT_DIR=$(dirname "$SCRIPT") -# Most RHEL options are options we want in Fedora so RHEL pending settings head -# to common/ +# Config options for RHEL should target the pending-ark directory, not pending-common. if [ "$FLAVOR" = "-rhel" ] then - FLAVOR="-common" + FLAVOR="-ark" fi # to handle this script being a symlink diff --git a/redhatsecureboot003.cer b/redhatsecureboot003.cer Binary files differdeleted file mode 100644 index 439b75bf3..000000000 --- a/redhatsecureboot003.cer +++ /dev/null diff --git a/redhatsecureboot301.cer b/redhatsecureboot301.cer Binary files differnew file mode 100644 index 000000000..20e660479 --- /dev/null +++ b/redhatsecureboot301.cer diff --git a/redhatsecureboot401.cer b/redhatsecureboot401.cer Binary files differdeleted file mode 100644 index 247666cfe..000000000 --- a/redhatsecureboot401.cer +++ /dev/null diff --git a/redhatsecureboot501.cer b/redhatsecureboot501.cer Binary files differnew file mode 100644 index 000000000..dfa7afb46 --- /dev/null +++ b/redhatsecureboot501.cer diff --git a/redhatsecurebootca1.cer b/redhatsecurebootca1.cer Binary files differnew file mode 100644 index 000000000..b2354007b --- /dev/null +++ b/redhatsecurebootca1.cer diff --git a/redhatsecurebootca2.cer b/redhatsecurebootca2.cer Binary files differdeleted file mode 100644 index 43502d6bc..000000000 --- a/redhatsecurebootca2.cer +++ /dev/null diff --git a/redhatsecurebootca4.cer b/redhatsecurebootca4.cer Binary files differdeleted file mode 100644 index 8cb32e68c..000000000 --- a/redhatsecurebootca4.cer +++ /dev/null diff --git a/redhatsecurebootca5.cer b/redhatsecurebootca5.cer Binary files differnew file mode 100644 index 000000000..dfb028495 --- /dev/null +++ b/redhatsecurebootca5.cer diff --git a/secureboot_ppc.cer b/secureboot_ppc.cer Binary files differnew file mode 100644 index 000000000..2c0087dbc --- /dev/null +++ b/secureboot_ppc.cer diff --git a/secureboot_s390.cer b/secureboot_s390.cer Binary files differnew file mode 100644 index 000000000..137d3858f --- /dev/null +++ b/secureboot_s390.cer @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-rc8.tar.xz) = 41568d2b3acd6dc06e183416a7d822ebd90d34b1a212f92ca605681bd4385251140fa9c3cabcf7cd355812d3df10842dbd28fc4f60c2d73394ed251f3c93a831 -SHA512 (kernel-abi-stablelists-5.17.0-0.rc8.123.tar.bz2) = cf5c762a3289272fce64537995634c0d0e0059c17c5f9bc7242e4929f75baf2cad5bbccbff747a1d59221e6ac48d70ed17dc75d85127faa9522160be35b3e1b3 -SHA512 (kernel-kabi-dw-5.17.0-0.rc8.123.tar.bz2) = 92963bb7533e17f518ee5ce95ead2db01b37195572b3da8589f6b5c750d45d086787becc98621e5c3c52d1037eea5f47ba5591be4c75d2d2d390f5de400a8d6a +SHA512 (linux-5.17.tar.xz) = f1f61baf70e17bff176ea1d60113a54c475baa1fe28087269c256c3de48498a1d89648139d4174abbc98c39ad823acdf6dc78e5d80f00152b730c4f1966e9189 +SHA512 (kernel-abi-stablelists-5.17.0-300.tar.bz2) = 996d5f26c9e2b18f3fec1b3fbcbefd9dcfd00f6357a12ae06ce2fa85165c4802a1232aeb3452b248edeb7605eeab096591aff224073b42a4dbad9062d810ccbf +SHA512 (kernel-kabi-dw-5.17.0-300.tar.bz2) = 7ce9a102047d2ad772554954964504592af215f7ee1b4668f1afa2896f3be5e04323ae3370b10834a64124911cce0801469ec6b565c62c6b09964ac4853c2da6 |