The patch titled Subject: merge fix for "s390/pci: remove races against pte updates" has been added to the -mm tree. Its filename is mm-simplify-follow_ptepmd-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-simplify-follow_ptepmd-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-simplify-follow_ptepmd-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Subject: merge fix for "s390/pci: remove races against pte updates" Link: https://lkml.kernel.org/r/20201111221254.7f6a3658@xxxxxxxxxxxxxxxx Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Reported-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx> Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/s390/pci/pci_mmio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/s390/pci/pci_mmio.c~mm-simplify-follow_ptepmd-fix +++ a/arch/s390/pci/pci_mmio.c @@ -173,7 +173,7 @@ SYSCALL_DEFINE3(s390_pci_mmio_write, uns if (!(vma->vm_flags & VM_WRITE)) goto out_unlock_mmap; - ret = follow_pte_pmd(vma->vm_mm, mmio_addr, NULL, &ptep, NULL, &ptl); + ret = follow_pte(vma->vm_mm, mmio_addr, NULL, &ptep, NULL, &ptl); if (ret) goto out_unlock_mmap; @@ -317,7 +317,7 @@ SYSCALL_DEFINE3(s390_pci_mmio_read, unsi if (!(vma->vm_flags & VM_WRITE)) goto out_unlock_mmap; - ret = follow_pte_pmd(vma->vm_mm, mmio_addr, NULL, &ptep, NULL, &ptl); + ret = follow_pte(vma->vm_mm, mmio_addr, NULL, &ptep, NULL, &ptl); if (ret) goto out_unlock_mmap; _ Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are kernelh-split-out-mathematical-helpers-fix.patch mm-simplify-follow_ptepmd-fix.patch kasan-split-out-shadowc-from-commonc-fix2.patch