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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1445 bytes --]

Hi all,

Today's linux-next merge of the jc_docs tree got a conflict in:

  Documentation/arm64/booting.rst

between commit:

  e24e03aa00f0 ("arm64: docs: Mandate that the I-cache doesn't hold stale kernel text")

from the arm64 tree and commit:

  877a37d31e0f ("docs: arm64: booting.rst: get rid of some warnings")

from the jc_docs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/arm64/booting.rst
index d063c05d5fb0,e50186092948..000000000000
--- a/Documentation/arm64/booting.rst
+++ b/Documentation/arm64/booting.rst
@@@ -173,8 -173,9 +173,10 @@@ Before jumping into the kernel, the fol
  - Caches, MMUs
  
    The MMU must be off.
+ 
 -  Instruction cache may be on or off.
 +  The instruction cache may be on or off, and must not hold any stale
 +  entries corresponding to the loaded kernel image.
+ 
    The address range corresponding to the loaded kernel image must be
    cleaned to the PoC. In the presence of a system cache or other
    coherent masters with caches enabled, this will typically require

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 912 bytes --]

Hi all,

Today's linux-next merge of the jc_docs tree got conflicts in:

  Documentation/arm64/kdump.rst
  Documentation/arm64/ptdump.rst

between commits:

  03dc0e05407f ("Documentation: add kdump.rst to present crashkernel reservation on arm64")
  a0238ada560f ("Documentation/arm64: Add ptdump documentation")

from the arm64 tree and commit:

  e4624435f38b ("docs: arm64: Move arm64 documentation under Documentation/arch/")

from the jc_docs tree.

I fixed it up (I added the files in the new directory) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1122 bytes --]

Hi all,

Today's linux-next merge of the jc_docs tree got a conflict in:

  Documentation/arm64/index.rst

between commit:

  5c5a8ac9b27b ("arm64: mte: Add Memory Tagging Extension documentation")

from the arm64 tree and commit:

  86de78d2c5f4 ("docs: arm64: convert perf.txt to ReST format")

from the jc_docs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/arm64/index.rst
index 4cd0e696f064,d9665d83c53a..000000000000
--- a/Documentation/arm64/index.rst
+++ b/Documentation/arm64/index.rst
@@@ -14,7 -14,7 +14,8 @@@ ARM64 Architectur
      hugetlbpage
      legacy_instructions
      memory
 +    memory-tagging-extension
+     perf
      pointer-authentication
      silicon-errata
      sve

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Catalin Marinas]

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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3705 bytes --]

Hi all,

Today's linux-next merge of the jc_docs tree got a conflict in:

  Documentation/filesystems/proc.rst

between commit:

  424037b77519 ("mm: smaps: Report arm64 guarded pages in smaps")

from the arm64 tree and commit:

  c33e97efa9d9 ("docs: filesystems: convert proc.txt to ReST")

from the jc_docs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

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
+     ==    =======================================
  
  Note that there is no guarantee that every flag and associated mnemonic will
  be present in all further kernel releases. Things get changed, the flags may

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]