summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-04-28 10:43:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-04-28 10:43:15 -0700
commit0d82044e1b7e5497c2177abd39b31e9ba27be8b7 (patch)
tree0d9f3ea99c192831c428e76c9e6789170e7fe484 /Makefile
parent975a0f400f2e1b5f585fec0b8b4c5942c3b05792 (diff)
parent7a3a4d763837d3aa654cd1059030950410c04d77 (diff)
Merge tag 'powerpc-5.1-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman: "A one-liner to make our Radix MMU support depend on HUGETLB_PAGE. We use some of the hugetlb inlines (eg. pud_huge()) when operating on the linear mapping and if they're compiled into empty wrappers we can corrupt memory. Then two fixes to our VFIO IOMMU code. The first is not a regression but fixes the locking to avoid a user-triggerable deadlock. The second does fix a regression since rc1, and depends on the first fix. It makes it possible to run guests with large amounts of memory again (~256GB). Thanks to Alexey Kardashevskiy" * tag 'powerpc-5.1-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/mm_iommu: Allow pinning large regions powerpc/mm_iommu: Fix potential deadlock powerpc/mm/radix: Make Radix require HUGETLB_PAGE
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions