Commit 0e18a6b4 authored by Andrew Morton's avatar Andrew Morton
Browse files

Sync with v6.2-rc4 

Merge branch 'master' into mm-stable
parents 12b98f33 5dc4c995

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ Tony Luck <tony.luck@intel.com> 
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tudor Ambarus <tudor.ambarus@linaro.org> <tudor.ambarus@microchip.com>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Documentation/arm64/silicon-errata.rst

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A710     | #2224489        | ARM64_ERRATUM_2224489       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A715     | #2645198        | ARM64_ERRATUM_2645198       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-X2       | #2119858        | ARM64_ERRATUM_2119858       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-X2       | #2224489        | ARM64_ERRATUM_2224489       |

Documentation/conf.py

+11 −1
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ def have_command(cmd): 
# Get Sphinx version

major, minor, patch = sphinx.version_info[:3]



#

# Warn about older versions that we don't want to support for much

# longer.

#

if (major < 2) or (major == 2 and minor < 4):

    print('WARNING: support for Sphinx < 2.4 will be removed soon.')



# If extensions (or modules to document with autodoc) are in another directory,

# add these directories to sys.path here. If the directory is relative to the
@@ -339,7 +345,11 @@ html_use_smartypants = False 


# Custom sidebar templates, maps document names to template names.

# Note that the RTD theme ignores this

html_sidebars = { '**': ["about.html", 'searchbox.html', 'localtoc.html', 'sourcelink.html']}

html_sidebars = { '**': ['searchbox.html', 'localtoc.html', 'sourcelink.html']}



# about.html is available for alabaster theme. Add it at the front.

if html_theme == 'alabaster':

    html_sidebars['**'].insert(0, 'about.html')



# Output file base name for HTML help builder.

htmlhelp_basename = 'TheLinuxKerneldoc'

Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml

+11 −0
Original line number Diff line number Diff line
@@ -54,6 +54,17 @@ properties: 
      - const: xo

      - const: alternate



  interrupts:

    minItems: 1

    maxItems: 3



  interrupt-names:

    minItems: 1

    items:

      - const: dcvsh-irq-0

      - const: dcvsh-irq-1

      - const: dcvsh-irq-2



  '#freq-domain-cells':

    const: 1

Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-aes.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Atmel Advanced Encryption Standard (AES) HW cryptographic accelerator



maintainers:

  - Tudor Ambarus <tudor.ambarus@microchip.com>

  - Tudor Ambarus <tudor.ambarus@linaro.org>



properties:

  compatible: