diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-01-16 18:24:15 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-01-16 18:24:15 -0600 |
| commit | e6651d00b28d7826835eb1ae6fbe4fa220ce9902 (patch) | |
| tree | 6cccef7a43804b29c16b90b74306761260eeeec8 | |
| parent | 630fad70a55b6aeff0e9a630f2e6792883c72022 (diff) | |
| download | kernel-e6651d00b28d7826835eb1ae6fbe4fa220ce9902.tar.gz kernel-e6651d00b28d7826835eb1ae6fbe4fa220ce9902.tar.xz kernel-e6651d00b28d7826835eb1ae6fbe4fa220ce9902.zip | |
More RHEL patches to revert
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
| -rw-r--r-- | Patchlist.changelog | 6 | ||||
| -rw-r--r-- | patch-5.16-redhat.patch | 47 |
2 files changed, 7 insertions, 46 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog index d77e189c6..996b43ca8 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,9 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/933f8e20d77088ff01589f9a625a1f8e69681c1b + 933f8e20d77088ff01589f9a625a1f8e69681c1b Revert "[scsi] megaraid_sas: re-add certain pci-ids" + +https://gitlab.com/cki-project/kernel-ark/-/commit/75d150b4f21dc262f30e552afd5264cd632ea738 + 75d150b4f21dc262f30e552afd5264cd632ea738 Revert "wireguard: disable in FIPS mode" + https://gitlab.com/cki-project/kernel-ark/-/commit/79cb6c7a857b0fbe827e089f447310d025398bf8 79cb6c7a857b0fbe827e089f447310d025398bf8 Revert "mm/cma: mark CMA on x86_64 tech preview and print RHEL-specific infos" diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index d3eae8004..99d8bf8fb 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -23,12 +23,10 @@ drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- drivers/iommu/iommu.c | 22 ++++ - drivers/net/wireguard/main.c | 6 + drivers/nvme/host/core.c | 22 +++- drivers/nvme/host/multipath.c | 19 ++-- drivers/nvme/host/nvme.h | 4 + drivers/pci/quirks.c | 24 ++++ - drivers/scsi/megaraid/megaraid_sas_base.c | 2 + drivers/usb/core/hub.c | 7 ++ include/linux/efi.h | 22 ++-- include/linux/lsm_hook_defs.h | 2 + @@ -46,7 +44,7 @@ security/lockdown/lockdown.c | 1 + security/security.c | 6 + tools/testing/selftests/netfilter/nft_nat.sh | 5 +- - 48 files changed, 762 insertions(+), 191 deletions(-) + 46 files changed, 754 insertions(+), 191 deletions(-) diff --git a/Makefile b/Makefile index fdbd06daf2af..0234d5708219 100644 @@ -1303,30 +1301,6 @@ index dd7863e453a5..6759ef17a2c3 100644 /* * Changes the default domain of an iommu group that has *only* one device * -diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c -index ee4da9ab8013..d395d11eadc4 100644 ---- a/drivers/net/wireguard/main.c -+++ b/drivers/net/wireguard/main.c -@@ -12,6 +12,7 @@ - - #include <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; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 1af8a4513708..5a23e077ab86 100644 --- a/drivers/nvme/host/core.c @@ -1498,25 +1472,6 @@ index 003950c738d2..ef27596d04d8 100644 /* * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. -diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c -index aeb95f409826..df6a1db7f8ea 100644 ---- a/drivers/scsi/megaraid/megaraid_sas_base.c -+++ b/drivers/scsi/megaraid/megaraid_sas_base.c -@@ -157,12 +157,14 @@ 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)}, diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 3bc4a86c3d0a..e346da4f58f2 100644 --- a/drivers/usb/core/hub.c |