diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-03 17:55:01 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-03 17:55:01 +0200 |
| commit | a50081b60368f2d368940c9b905256024083b426 (patch) | |
| tree | cf7d3525e6ade1532d68f9514ca7b086e6831df2 /patch-6.0-redhat.patch | |
| parent | 84eb39057c4d2a0a4d9df3df95f683d86f5a521d (diff) | |
| parent | 247e0276be5baeec57dba5c3e678c5bac054b026 (diff) | |
| download | kernel-a50081b60368f2d368940c9b905256024083b426.tar.gz kernel-a50081b60368f2d368940c9b905256024083b426.tar.xz kernel-a50081b60368f2d368940c9b905256024083b426.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.0.0-54.vanilla.1.fc38kernel-6.0.0-54.vanilla.1.fc37kernel-6.0.0-54.vanilla.1.fc36kernel-6.0.0-54.vanilla.1.fc35
Diffstat (limited to 'patch-6.0-redhat.patch')
| -rw-r--r-- | patch-6.0-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch index 3b54785c3..9d42b04af 100644 --- a/patch-6.0-redhat.patch +++ b/patch-6.0-redhat.patch @@ -121,7 +121,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 647a42a1f800..769b7c25a6a9 100644 +index 8478e13e9424..037381430a72 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1246,7 +1246,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 66446f1e06cf..29fccce7ba4e 100644 +index 8d5a7ae19844..f3939183c346 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) |