diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-07-18 15:42:15 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-07-18 15:42:15 +0200 |
| commit | 3135d4f5c3231ea2ae36afbed80a1cc5afb9ae4c (patch) | |
| tree | a9b30699d01edc1f6fe484b19025ad1f71b5aa57 /patch-5.19-redhat.patch | |
| parent | 55526cc90f6aa9cc09a9c4468787e1f9f295a2d1 (diff) | |
| parent | df37aba8e2edf1e5a9774342b2e23bb5d6a4f996 (diff) | |
| download | kernel-3135d4f5c3231ea2ae36afbed80a1cc5afb9ae4c.tar.gz kernel-3135d4f5c3231ea2ae36afbed80a1cc5afb9ae4c.tar.xz kernel-3135d4f5c3231ea2ae36afbed80a1cc5afb9ae4c.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.19.0-0.rc7.53.vanilla.1.fc37kernel-5.19.0-0.rc7.53.vanilla.1.fc36kernel-5.19.0-0.rc7.53.vanilla.1.fc35
Diffstat (limited to 'patch-5.19-redhat.patch')
| -rw-r--r-- | patch-5.19-redhat.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch index bd8b47604..414913c08 100644 --- a/patch-5.19-redhat.patch +++ b/patch-5.19-redhat.patch @@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index faa4880f25f7..6135cccdcf3f 100644 +index 00fd80c5dd6e..7ab3609b69aa 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1226,7 +1226,7 @@ index ee4da9ab8013..d395d11eadc4 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index ec6ac298d8de..ddce2807c680 100644 +index 6a12a906a11e..463bcb0b62cd 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1638,7 +1638,7 @@ index a1b9be245560..aa8c493241c6 100644 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 c95360a3c186..b7d7b4639a9e 100644 +index 0917b05059b4..38cef4e394fb 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); |