diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-12 16:21:21 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-12 16:21:21 +0100 |
commit | 7bf61e21c4abbe5c6838739e701f2f4cb6329c7c (patch) | |
tree | e6739027f5b71b7de289940bb1baba39633857b7 | |
parent | 131f021b64d5436c78e29876275867e9743293c2 (diff) | |
parent | 3c5151dfa46825c42e58efcbc0b911dcb41f679d (diff) | |
download | kernel-7bf61e21c4abbe5c6838739e701f2f4cb6329c7c.tar.gz kernel-7bf61e21c4abbe5c6838739e701f2f4cb6329c7c.tar.xz kernel-7bf61e21c4abbe5c6838739e701f2f4cb6329c7c.zip |
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
-rw-r--r-- | Patchlist.changelog | 6 | ||||
-rwxr-xr-x | kernel.spec | 2 | ||||
-rw-r--r-- | patch-5.15-redhat.patch | 47 | ||||
-rw-r--r-- | sources | 2 |
4 files changed, 10 insertions, 47 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog index 9c3dfa583..343a7e184 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,9 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/dbfaeb8e3c1a949e75c8e7aecee8c57ed54c9d02 + dbfaeb8e3c1a949e75c8e7aecee8c57ed54c9d02 Revert "[scsi] megaraid_sas: re-add certain pci-ids" + +https://gitlab.com/cki-project/kernel-ark/-/commit/32f698e43b58794dfe27afe719f575f78da95abe + 32f698e43b58794dfe27afe719f575f78da95abe Revert "wireguard: disable in FIPS mode" + https://gitlab.com/cki-project/kernel-ark/-/commit/83006c3429d58b6247863c348495417636186107 83006c3429d58b6247863c348495417636186107 Revert "[fs] dax: mark tech preview" diff --git a/kernel.spec b/kernel.spec index 464ec895a..ee6321103 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2968,6 +2968,8 @@ fi # %changelog * Tue Nov 09 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-200] +- Revert "[scsi] megaraid_sas: re-add certain pci-ids" (Justin M. Forbes) +- Revert "wireguard: disable in FIPS mode" (Justin M. Forbes) - Revert "[fs] dax: mark tech preview" (Justin M. Forbes) - Revert "wireguard: mark as Tech Preview" (Justin M. Forbes) - Revert "add pci_hw_vendor_status()" (Justin M. Forbes) diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch index 0ec5a5c2a..a4e2894cc 100644 --- a/patch-5.15-redhat.patch +++ b/patch-5.15-redhat.patch @@ -23,12 +23,10 @@ drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- drivers/input/serio/i8042-x86ia64io.h | 14 +++ 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 ++ fs/btrfs/async-thread.c | 14 +++ include/linux/efi.h | 22 ++-- @@ -44,7 +42,7 @@ security/lockdown/Kconfig | 13 +++ security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 46 files changed, 716 insertions(+), 192 deletions(-) + 44 files changed, 708 insertions(+), 192 deletions(-) diff --git a/Makefile b/Makefile index ffcc7eadc44b..7c94a55d6770 100644 @@ -1297,30 +1295,6 @@ index 3303d707bab4..372edaaafaa1 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 75dbe77b0b4b..4bd6dd722f44 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 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 f8dd664b2eda..0ff9ea8340e4 100644 --- a/drivers/nvme/host/core.c @@ -1492,25 +1466,6 @@ index 4537d1ea14fd..af30ab6c81e2 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 39d8754e63ac..044e54b7aeda 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 86658a81d284..5647f4756e97 100644 --- a/drivers/usb/core/hub.c @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294 SHA512 (linux-5.15.1.tar.xz) = 927a475f0cc40ed08c462130d799b0d74a6200d2db50c92940fc0d63c2aac9029ff4276e5bbfecad49953829599c155a96f8ce563d448f9649432e4c3d730b07 -SHA512 (kernel-abi-stablelists-5.15.1-200.tar.bz2) = 3be403e64a33a4b0cbb11ecedcb730058f3da9eb62d29642a92f54001b571ac5a1c39b8773638c908d97e70f9b01c5a109968472c17087e76f53dcdcbc1d6049 +SHA512 (kernel-abi-stablelists-5.15.1-200.tar.bz2) = 3b43f148d00de83c4649cf552e97c0787c25721fe7932332ee5d0cdc5b7c4b13a1fc988ba42b3696d04777037a0a0076f21842ffd91ccb8249d1be9dba4189b7 SHA512 (kernel-kabi-dw-5.15.1-200.tar.bz2) = 8e06c53dd3b27a3980c9cbbfca86b12ddff0961c1534b56dc6bc292752dfa3dca455a5adbce56c559a4470563df868c62dec76d4ff06df474eef2392e22f8917 |