diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 15:09:35 +0300 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 15:09:35 +0300 |
commit | d0a31acc34dc2921ad32a67a7534704114e64f82 (patch) | |
tree | 2b77d8d61170c5f9633c49eaddd67dca5bb9c38f /drivers/cpuidle/cpuidle-haltpoll.c | |
parent | f06351f8c0c85e2d53e73c53a33b4ef55b4ad6de (diff) | |
parent | af2d861d4cd2a4da5137f795ee3509e6f944a25b (diff) | |
download | linux-d0a31acc34dc2921ad32a67a7534704114e64f82.tar.xz |
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.
Diffstat (limited to 'drivers/cpuidle/cpuidle-haltpoll.c')
0 files changed, 0 insertions, 0 deletions