diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-24 10:37:48 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-24 10:37:48 +0300 |
| commit | c85f15519d45588ce6ab8ad18616d2c0175a25d6 (patch) | |
| tree | 4b27357fa550be86fde495ea9c9b2bdb54ebe1d7 /Documentation/arm64/memory.rst | |
| parent | f2409865c23ff83e08e07be8fa5d5d9b96f61487 (diff) | |
| parent | f8788d86ab28f61f7b46eb6be375f8a726783636 (diff) | |
| download | linux-c85f15519d45588ce6ab8ad18616d2c0175a25d6.tar.xz | |
Merge 5.6-rc3 into staging-next
We need the staging fixes in here, and it resolves a merge issue in the
MAINTAINERS file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/arm64/memory.rst')
| -rw-r--r-- | Documentation/arm64/memory.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm64/memory.rst b/Documentation/arm64/memory.rst index 02e02175e6f5..cf03b3290800 100644 --- a/Documentation/arm64/memory.rst +++ b/Documentation/arm64/memory.rst @@ -129,7 +129,7 @@ this logic. As a single binary will need to support both 48-bit and 52-bit VA spaces, the VMEMMAP must be sized large enough for 52-bit VAs and -also must be sized large enought to accommodate a fixed PAGE_OFFSET. +also must be sized large enough to accommodate a fixed PAGE_OFFSET. Most code in the kernel should not need to consider the VA_BITS, for code that does need to know the VA size the variables are |