diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-07-02 16:32:02 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-07-02 16:32:02 +0200 |
| commit | d94e396834f5c80b41ddf4628b9e7a0494ce8be5 (patch) | |
| tree | 3fc68e4d7c6b392a93c60545176d7ccc9efa35fb /patch-5.18-redhat.patch | |
| parent | 7d5085c8f7bdec650ea31a7f7bbc89a39b5bf3eb (diff) | |
| parent | e87dffc473a9edd837cf38fb233c3afc065bce50 (diff) | |
| download | kernel-d94e396834f5c80b41ddf4628b9e7a0494ce8be5.tar.gz kernel-d94e396834f5c80b41ddf4628b9e7a0494ce8be5.tar.xz kernel-d94e396834f5c80b41ddf4628b9e7a0494ce8be5.zip | |
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.18-redhat.patch')
| -rw-r--r-- | patch-5.18-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index 0008a891f..baf737bec 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -45,7 +45,7 @@ 44 files changed, 721 insertions(+), 191 deletions(-) diff --git a/Makefile b/Makefile -index 61d63068553c..cd3197d5397e 100644 +index 6ac3335f65af..5df170f9243f 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1328,7 +1328,7 @@ index 857d4c2fd1a2..9353941f3a97 100644 * Changes the default domain of an iommu group that has *only* one device * diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 1ea85c88d795..d30563dabd95 100644 +index a2862a56fadc..1cddbc757925 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) |