Merge tag 'v5.18-rc4' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 5 May 2022 12:09:35 +0000 (22:09 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 5 May 2022 12:09:35 +0000 (22:09 +1000)
commitd0a31acc34dc2921ad32a67a7534704114e64f82
tree2b77d8d61170c5f9633c49eaddd67dca5bb9c38f
parentf06351f8c0c85e2d53e73c53a33b4ef55b4ad6de
parentaf2d861d4cd2a4da5137f795ee3509e6f944a25b
Merge tag 'v5.18-rc4' into next

Merge master into next, to bring in commit 5f24d5a579d1 ("mm, hugetlb:
allow for "high" userspace addresses"), which is needed as a
prerequisite for the series converting powerpc to the generic mmap
logic.
arch/powerpc/kernel/time.c
arch/powerpc/perf/power9-pmu.c