Re: linux-next: manual merge of the jc_docs tree with the arm64 tree

[Catalin Marinas <catalin.marinas@arm.com>]

On Wed, Mar 18, 2020 at 12:40:33PM +1100, Stephen Rothwell wrote:
> diff --cc Documentation/filesystems/proc.rst
> index ed5465d0f435,38b606991065..000000000000
> --- a/Documentation/filesystems/proc.rst
> +++ b/Documentation/filesystems/proc.rst
> @@@ -489,37 -511,39 +511,40 @@@ does not take into account swapped out 
>   "THPeligible" indicates whether the mapping is eligible for allocating THP
>   pages - 1 if true, 0 otherwise. It just shows the current status.
>   
> - "VmFlags" field deserves a separate description. This member represents the kernel
> - flags associated with the particular virtual memory area in two letter encoded
> - manner. The codes are the following:
> -     rd  - readable
> -     wr  - writeable
> -     ex  - executable
> -     sh  - shared
> -     mr  - may read
> -     mw  - may write
> -     me  - may execute
> -     ms  - may share
> -     gd  - stack segment growns down
> -     pf  - pure PFN range
> -     dw  - disabled write to the mapped file
> -     lo  - pages are locked in memory
> -     io  - memory mapped I/O area
> -     sr  - sequential read advise provided
> -     rr  - random read advise provided
> -     dc  - do not copy area on fork
> -     de  - do not expand area on remapping
> -     ac  - area is accountable
> -     nr  - swap space is not reserved for the area
> -     ht  - area uses huge tlb pages
> -     ar  - architecture specific flag
> -     dd  - do not include area into core dump
> -     sd  - soft-dirty flag
> -     mm  - mixed map area
> -     hg  - huge page advise flag
> -     nh  - no-huge page advise flag
> -     mg  - mergable advise flag
> + "VmFlags" field deserves a separate description. This member represents the
> + kernel flags associated with the particular virtual memory area in two letter
> + encoded manner. The codes are the following:
> + 
> +     ==    =======================================
> +     rd    readable
> +     wr    writeable
> +     ex    executable
> +     sh    shared
> +     mr    may read
> +     mw    may write
> +     me    may execute
> +     ms    may share
> +     gd    stack segment growns down
> +     pf    pure PFN range
> +     dw    disabled write to the mapped file
> +     lo    pages are locked in memory
> +     io    memory mapped I/O area
> +     sr    sequential read advise provided
> +     rr    random read advise provided
> +     dc    do not copy area on fork
> +     de    do not expand area on remapping
> +     ac    area is accountable
> +     nr    swap space is not reserved for the area
> +     ht    area uses huge tlb pages
> +     ar    architecture specific flag
> +     dd    do not include area into core dump
> +     sd    soft dirty flag
> +     mm    mixed map area
> +     hg    huge page advise flag
> +     nh    no huge page advise flag
> +     mg    mergable advise flag
> ++    bt    arm64 BTI guarded page
> +     ==    =======================================

Looks fine. Thanks Stephen.

-- 
Catalin