diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-12-23 20:01:00 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-12-23 20:01:00 +0100 |
commit | 2696bc15044324494e2f3a29c722288ad66d05b4 (patch) | |
tree | 7733ea6a33af26901f15d053a5d65f1e95e28dd8 /patch-6.2-redhat.patch | |
parent | b0995a72579bb0c91e12a767b0058ab55acf3659 (diff) | |
parent | 15ce02cc96d0b0f36334bbd6370462fb90037b94 (diff) | |
download | kernel-2696bc15044324494e2f3a29c722288ad66d05b4.tar.gz kernel-2696bc15044324494e2f3a29c722288ad66d05b4.tar.xz kernel-2696bc15044324494e2f3a29c722288ad66d05b4.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc0.20221223git8395ae05cb5a.12.vanilla.1.fc38kernel-6.2.0-0.rc0.20221223git8395ae05cb5a.12.vanilla.1.fc37kernel-6.2.0-0.rc0.20221223git8395ae05cb5a.12.vanilla.1.fc36
Diffstat (limited to 'patch-6.2-redhat.patch')
-rw-r--r-- | patch-6.2-redhat.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 464311238..bf29c9896 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -1229,7 +1229,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 f72fc3bd07c3..d14838f24adb 100644 +index 95c488ea91c3..fad3f16d463f 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) |