summaryrefslogtreecommitdiffstats
path: root/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-06-01 22:13:38 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-06-01 22:13:38 +0200
commit74ab72ba21a4bb026b91637fd91ef20edef750a0 (patch)
treef4d83deecb8c546b797e3dbc4c4c0c705a02ffcb /0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch
parent9097b7b287480e96d570cb9a344eab15587c4508 (diff)
parentf0c9dd0c81745d7c1600ecc6ce3d20ba89c2f56e (diff)
downloadkernel-74ab72ba21a4bb026b91637fd91ef20edef750a0.tar.gz
kernel-74ab72ba21a4bb026b91637fd91ef20edef750a0.tar.xz
kernel-74ab72ba21a4bb026b91637fd91ef20edef750a0.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-1.vanilla.1.fc33kernel-5.7.0-1.vanilla.1.fc32kernel-5.7.0-1.vanilla.1.fc31
Diffstat (limited to '0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch')
-rw-r--r--0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch b/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch
index 158fd3889..e6eef22d6 100644
--- a/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch
+++ b/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch
@@ -57,7 +57,7 @@ Signed-off-by: Laura Abbott <labbott@redhat.com>
1 file changed, 22 insertions(+)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
-index 1faa08c8bbb4..b64444b1bd1a 100644
+index 03d6a26687bc..86981f228c90 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -7,6 +7,7 @@