diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-30 17:28:25 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-30 17:28:25 +0100 |
| commit | 98103099fa09038c128dbb5c73ef988743f36b3c (patch) | |
| tree | a24f6b282332c56ec6908cc730db8df301516d91 /patch-6.2-redhat.patch | |
| parent | d14d7db6947365cb0e615aedea8cede8f6bcc510 (diff) | |
| parent | b19a5698c95c95f50ea96f25805ee95c5b32ded7 (diff) | |
| download | kernel-6.2.0-0.rc6.44.vanilla.1.fc36.tar.gz kernel-6.2.0-0.rc6.44.vanilla.1.fc36.tar.xz kernel-6.2.0-0.rc6.44.vanilla.1.fc36.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc6.44.vanilla.1.fc38kernel-6.2.0-0.rc6.44.vanilla.1.fc37kernel-6.2.0-0.rc6.44.vanilla.1.fc36
Diffstat (limited to 'patch-6.2-redhat.patch')
| -rw-r--r-- | patch-6.2-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 0b3e296a3..67b55afd6 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index c1ead4cd2342..eecdc6ae5d6e 100644 +index 749bb455546e..d460f5a0eb93 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1228,7 +1228,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 7be562a4e1aa..0169d9f5df9b 100644 +index 505e16f20e57..f59344f98b1e 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) |