diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 14:09:35 +0200 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 14:09:35 +0200 |
commit | d0a31acc34dc2921ad32a67a7534704114e64f82 (patch) | |
tree | 2b77d8d61170c5f9633c49eaddd67dca5bb9c38f /block/blk-cgroup-rwstat.c | |
parent | powerpc/eeh: Remove unused inline functions (diff) | |
parent | Linux 5.18-rc4 (diff) | |
download | linux-d0a31acc34dc2921ad32a67a7534704114e64f82.tar.xz linux-d0a31acc34dc2921ad32a67a7534704114e64f82.zip |
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 'block/blk-cgroup-rwstat.c')
0 files changed, 0 insertions, 0 deletions