Merge tag 'docs-5.2' of git://git.lwn.net/linux

Pull documentation updates from Jonathan Corbet:
 "A reasonably busy cycle for docs, including:

   - Lots of work on the Chinese and Italian translations

   - Some license-rules clarifications from Christoph

   - Various build-script fixes

   - A new document on memory models

   - RST conversion of the live-patching docs

   - The usual collection of typo fixes and corrections"

* tag 'docs-5.2' of git://git.lwn.net/linux: (140 commits)
  docs/livepatch: Unify style of livepatch documentation in the ReST format
  docs: livepatch: convert docs to ReST and rename to *.rst
  scripts/documentation-file-ref-check: detect broken :doc:`foo`
  scripts/documentation-file-ref-check: don't parse Next/ dir
  LICENSES: Rename other to deprecated
  LICENSES: Clearly mark dual license only licenses
  docs: Don't reference the ZLib license in license-rules.rst
  docs/vm: Minor editorial changes in the THP and hugetlbfs
  docs/vm: add documentation of memory models
  doc:it_IT: translation alignment
  doc: fix typo in PGP guide
  dontdiff: update with Kconfig build artifacts
  docs/zh_CN: fix typos in 1.Intro.rst file
  docs/zh_CN: redirect CoC docs to Chinese version
  doc: mm: migration doesn't use FOLL_SPLIT anymore
  docs: doc-guide: remove the extension from .rst files
  doc: kselftest: Fix KBUILD_OUTPUT usage instructions
  docs: trace: fix some Sphinx warnings
  docs: speculation.txt: mark example blocks as such
  docs: ntb.txt: add blank lines to clean up some Sphinx warnings
  ...

diff --combined .mailmap
index 0049c0b49056e3217852a1d11be98c7b3fc76962,7dc884c03d138e0db6d6c74560db435c50b7e364..07a777f9d687eb8a9bc74b4aa53c080af8f3fccb
--- 1/.mailmap
--- 2/.mailmap
+++ b/.mailmap
@@@ -16,9 -16,8 +16,11 @@@ Alan Cox <alan@lxorguk.ukuu.org.uk
  Alan Cox <root@hraefn.swansea.linux.org.uk>
  Aleksey Gorelov <aleksey_gorelov@phoenix.com>
  Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
+ Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>
+ Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>
 +Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
 +Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
 +Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
  Al Viro <viro@ftp.linux.org.uk>
  Al Viro <viro@zenIV.linux.org.uk>
  Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
@@@ -49,12 -48,6 +51,12 @@@ Christoph Hellwig <hch@lst.de
  Christophe Ricard <christophe.ricard@gmail.com>
  Corey Minyard <minyard@acm.org>
  Damian Hobson-Garcia <dhobsong@igel.co.jp>
 +Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
 +Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
 +Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>
 +Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
 +Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
 +Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
  David Brownell <david-b@pacbell.net>
  David Woodhouse <dwmw2@shinybook.infradead.org>
  Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
@@@ -126,6 -119,8 +128,8 @@@ Leonid I Ananiev <leonid.i.ananiev@inte
  Linas Vepstas <linas@austin.ibm.com>
  Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
  Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
+ Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
+ Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
  Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
  Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
  Mark Brown <broonie@sirena.org.uk>
@@@ -165,8 -160,6 +169,8 @@@ Morten Welinder <welinder@darter.rentec
  Morten Welinder <welinder@troll.com>
  Mythri P K <mythripk@ti.com>
  Nguyen Anh Quynh <aquynh@gmail.com>
 +Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
 +Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
  Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
  Patrick Mochel <mochel@digitalimplant.org>
  Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
@@@ -198,7 -191,6 +202,7 @@@ Santosh Shilimkar <ssantosh@kernel.org
  Santosh Shilimkar <santosh.shilimkar@oracle.org>
  Sascha Hauer <s.hauer@pengutronix.de>
  S.Çağlar Onur <caglar@pardus.org.tr>
 +Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
  Sebastian Reichel <sre@kernel.org> <sre@debian.org>
  Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
  Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
@@@ -217,6 -209,8 +221,8 @@@ Tejun Heo <htejun@gmail.com
  Thomas Graf <tgraf@suug.ch>
  Thomas Pedersen <twp@codeaurora.org>
  Tony Luck <tony.luck@intel.com>
+ TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
+ TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
  Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
  Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
  Uwe Kleine-König <ukl@pengutronix.de>
@@@ -236,5 -230,3 +242,5 @@@ Yakir Yang <kuankuan.y@gmail.com> <ykk@
  Yusuke Goda <goda.yusuke@renesas.com>
  Gustavo Padovan <gustavo@las.ic.unicamp.br>
  Gustavo Padovan <padovan@profusion.mobi>
 +Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
 +Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

diff --combined Documentation/clearing-warn-once.txt
index c68598b31428d7726816011b8ff4bd1eab33f583,4aa938262d0ea5724db100e42f7a066fcc86b493..211fd926cf00f5994f322d4edb1f0d45a4fd442a
--- 1/Documentation/clearing-warn-once.txt
--- 2/Documentation/clearing-warn-once.txt
+++ b/Documentation/clearing-warn-once.txt
@@@ -1,5 -1,7 +1,7 @@@
+ Clearing WARN_ONCE
+ ------------------
  
 -WARN_ONCE / WARN_ON_ONCE only print a warning once.
 +WARN_ONCE / WARN_ON_ONCE / printk_once only emit a message once.
  
  echo 1 > /sys/kernel/debug/clear_warn_once
  

diff --combined Documentation/dev-tools/kselftest.rst
index c8c03388b9de62eeda239bda0a687dda759030b8,79d15421e9a5453241e252a984c717b1287b976d..25604904fa6ed51292b02878691966716a68b140
--- 1/Documentation/dev-tools/kselftest.rst
--- 2/Documentation/dev-tools/kselftest.rst
+++ b/Documentation/dev-tools/kselftest.rst
@@@ -7,6 -7,11 +7,11 @@@ directory. These are intended to be sma
  paths in the kernel. Tests are intended to be run after building, installing
  and booting a kernel.
  
+ You can find additional information on Kselftest framework, how to
+ write new tests using the framework on Kselftest wiki:
+ 
+ https://kselftest.wiki.kernel.org/
+ 
  On some systems, hot-plug tests could hang forever waiting for cpu and
  memory to be ready to be offlined. A special hot-plug target is created
  to run the full range of hot-plug tests. In default mode, hot-plug tests run
@@@ -14,10 -19,6 +19,10 @@@ in safe mode with a limited scope. In l
  run on a single cpu as opposed to all hotplug capable cpus, and memory
  hotplug test is run on 2% of hotplug capable memory instead of 10%.
  
 +kselftest runs as a userspace process.  Tests that can be written/run in
 +userspace may wish to use the `Test Harness`_.  Tests that need to be
 +run in kernel space may wish to use a `Test Module`_.
 +
  Running the selftests (hotplug tests are run in limited mode)
  =============================================================
  
@@@ -35,17 -36,32 +40,32 @@@ To build and run the tests with a singl
  
  Note that some tests will require root privileges.
  
- Build and run from user specific object directory (make O=dir)::
+ Kselftest supports saving output files in a separate directory and then
+ running tests. To locate output files in a separate directory two syntaxes
+ are supported. In both cases the working directory must be the root of the
+ kernel src. This is applicable to "Running a subset of selftests" section
+ below.
+ 
+ To build, save output files in a separate directory with O= ::
  
    $ make O=/tmp/kselftest kselftest
  
- Build and run KBUILD_OUTPUT directory (make KBUILD_OUTPUT=)::
+ To build, save output files in a separate directory with KBUILD_OUTPUT ::
+ 
+   $ export KBUILD_OUTPUT=/tmp/kselftest; make kselftest
  
-   $ make KBUILD_OUTPUT=/tmp/kselftest kselftest
+ The O= assignment takes precedence over the KBUILD_OUTPUT environment
+ variable.
  
- The above commands run the tests and print pass/fail summary to make it
- easier to understand the test results. Please find the detailed individual
- test results for each test in /tmp/testname file(s).
+ The above commands by default run the tests and print full pass/fail report.
+ Kselftest supports "summary" option to make it easier to understand the test
+ results. Please find the detailed individual test results for each test in
+ /tmp/testname file(s) when summary option is specified. This is applicable
+ to "Running a subset of selftests" section below.
+ 
+ To run kselftest with summary option enabled ::
+ 
+   $ make summary=1 kselftest
  
  Running a subset of selftests
  =============================
@@@ -61,17 -77,13 +81,13 @@@ You can specify multiple tests to buil
  
    $  make TARGETS="size timers" kselftest
  
- Build and run from user specific object directory (make O=dir)::
+ To build, save output files in a separate directory with O= ::
  
    $ make O=/tmp/kselftest TARGETS="size timers" kselftest
  
- Build and run KBUILD_OUTPUT directory (make KBUILD_OUTPUT=)::
- 
-   $ make KBUILD_OUTPUT=/tmp/kselftest TARGETS="size timers" kselftest
+ To build, save output files in a separate directory with KBUILD_OUTPUT ::
  
- The above commands run the tests and print pass/fail summary to make it
- easier to understand the test results. Please find the detailed individual
- test results for each test in /tmp/testname file(s).
+   $ export KBUILD_OUTPUT=/tmp/kselftest; make TARGETS="size timers" kselftest
  
  See the top-level tools/testing/selftests/Makefile for the list of all
  possible targets.
@@@ -165,97 -177,11 +181,97 @@@ Contributing new tests (details
  
     e.g: tools/testing/selftests/android/config
  
 +Test Module
 +===========
 +
 +Kselftest tests the kernel from userspace.  Sometimes things need
 +testing from within the kernel, one method of doing this is to create a
 +test module.  We can tie the module into the kselftest framework by
 +using a shell script test runner.  ``kselftest_module.sh`` is designed
 +to facilitate this process.  There is also a header file provided to
 +assist writing kernel modules that are for use with kselftest:
 +
 +- ``tools/testing/kselftest/kselftest_module.h``
 +- ``tools/testing/kselftest/kselftest_module.sh``
 +
 +How to use
 +----------
 +
 +Here we show the typical steps to create a test module and tie it into
 +kselftest.  We use kselftests for lib/ as an example.
 +
 +1. Create the test module
 +
 +2. Create the test script that will run (load/unload) the module
 +   e.g. ``tools/testing/selftests/lib/printf.sh``
 +
 +3. Add line to config file e.g. ``tools/testing/selftests/lib/config``
 +
 +4. Add test script to makefile  e.g. ``tools/testing/selftests/lib/Makefile``
 +
 +5. Verify it works:
 +
 +.. code-block:: sh
 +
 +   # Assumes you have booted a fresh build of this kernel tree
 +   cd /path/to/linux/tree
 +   make kselftest-merge
 +   make modules
 +   sudo make modules_install
 +   make TARGETS=lib kselftest
 +
 +Example Module
 +--------------
 +
 +A bare bones test module might look like this:
 +
 +.. code-block:: c
 +
 +   // SPDX-License-Identifier: GPL-2.0+
 +
 +   #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 +
 +   #include "../tools/testing/selftests/kselftest_module.h"
 +
 +   KSTM_MODULE_GLOBALS();
 +
 +   /*
 +    * Kernel module for testing the foobinator
 +    */
 +
 +   static int __init test_function()
 +   {
 +           ...
 +   }
 +
 +   static void __init selftest(void)
 +   {
 +           KSTM_CHECK_ZERO(do_test_case("", 0));
 +   }
 +
 +   KSTM_MODULE_LOADERS(test_foo);
 +   MODULE_AUTHOR("John Developer <jd@fooman.org>");
 +   MODULE_LICENSE("GPL");
 +
 +Example test script
 +-------------------
 +
 +.. code-block:: sh
 +
 +    #!/bin/bash
 +    # SPDX-License-Identifier: GPL-2.0+
 +    $(dirname $0)/../kselftest_module.sh "foo" test_foo
 +
 +
  Test Harness
  ============
  
 -The kselftest_harness.h file contains useful helpers to build tests.  The tests
 -from tools/testing/selftests/seccomp/seccomp_bpf.c can be used as example.
 +The kselftest_harness.h file contains useful helpers to build tests.  The
 +test harness is for userspace testing, for kernel space testing see `Test
 +Module`_ above.
 +
 +The tests from tools/testing/selftests/seccomp/seccomp_bpf.c can be used as
 +example.
  
  Example
  -------

diff --combined Documentation/dontdiff
index 48e1930fb4a4d895e1822e82062b2a58d747f851,15c54da5c763fbfa47d50c60449cd5a871af7ea6..5eba889ea84da0b95728adfb6f82fa9b0213bbdb
--- 1/Documentation/dontdiff
--- 2/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@@ -127,7 -127,7 +127,7 @@@ flask.
  fore200e_mkfirm
  fore200e_pca_fw.c*
  gconf
- gconf.glade.h
+ gconf-cfg
  gen-devlist
  gen_crc32table
  gen_init_cpio
@@@ -148,24 -148,22 +148,22 @@@ int32.
  int4.c
  int8.c
  kallsyms
- kconfig
  keywords.c
  ksym.c*
  ksym.h*
- kxgettext
  *lex.c
  *lex.*.c
  linux
  logo_*.c
  logo_*_clut224.c
  logo_*_mono.c
- lxdialog
  mach-types
  mach-types.h
  machtypes.h
  map
  map_hugetlb
  mconf
+ mconf-cfg
  miboot*
  mk_elfconfig
  mkboot
@@@ -176,13 -174,12 +174,14 @@@ mkpre
  mkregtable
  mktables
  mktree
 +mkutf8data
  modpost
  modules.builtin
 +modules.builtin.modinfo
  modules.order
  modversions.h*
  nconf
+ nconf-cfg
  ncscope.*
  offset.h
  oui.c*
@@@ -202,6 -199,7 +201,7 @@@ pnmtolog
  ppc_defs.h*
  pss_boot.h
  qconf
+ qconf-cfg
  r100_reg_safe.h
  r200_reg_safe.h
  r300_reg_safe.h
@@@ -256,7 -254,6 +256,7 @@@ vsyscall_32.ld
  wanxlfw.inc
  uImage
  unifdef
 +utf8data.h
  wakeup.bin
  wakeup.elf
  wakeup.lds

diff --combined MAINTAINERS
index e897d952100044976c8ca8fea2d01e92fb5b9dbe,1fad16da8af0ec704d62c17e9cb6e606395c3463..4244dd341eb779521a745e250e1ca0fd7253a0b7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -268,13 -268,12 +268,13 @@@ L:      linux-gpio@vger.kernel.or
  S:    Maintained
  F:    drivers/gpio/gpio-104-idio-16.c
  
 -ACCES 104-QUAD-8 IIO DRIVER
 +ACCES 104-QUAD-8 DRIVER
  M:    William Breathitt Gray <vilhelm.gray@gmail.com>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-counter-104-quad-8
  F:    Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8
 -F:    drivers/iio/counter/104-quad-8.c
 +F:    drivers/counter/104-quad-8.c
  
  ACCES PCI-IDIO-16 GPIO DRIVER
  M:    William Breathitt Gray <vilhelm.gray@gmail.com>
@@@ -469,7 -468,7 +469,7 @@@ ADM1025 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/adm1025
 +F:    Documentation/hwmon/adm1025.rst
  F:    drivers/hwmon/adm1025.c
  
  ADM1029 HARDWARE MONITOR DRIVER
@@@ -521,7 -520,7 +521,7 @@@ ADS1015 HARDWARE MONITOR DRIVE
  M:    Dirk Eibach <eibach@gdsys.de>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/ads1015
 +F:    Documentation/hwmon/ads1015.rst
  F:    drivers/hwmon/ads1015.c
  F:    include/linux/platform_data/ads1015.h
  
@@@ -534,7 -533,7 +534,7 @@@ ADT7475 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/adt7475
 +F:    Documentation/hwmon/adt7475.rst
  F:    drivers/hwmon/adt7475.c
  
  ADVANSYS SCSI DRIVER
@@@ -765,7 -764,7 +765,7 @@@ AMD FAM15H PROCESSOR POWER MONITORING D
  M:    Huang Rui <ray.huang@amd.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Supported
 -F:    Documentation/hwmon/fam15h_power
 +F:    Documentation/hwmon/fam15h_power.rst
  F:    drivers/hwmon/fam15h_power.c
  
  AMD FCH GPIO DRIVER
@@@ -869,7 -868,7 +869,7 @@@ L: linux-iio@vger.kernel.or
  W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/iio/adc/ad7606.c
 -F:    Documentation/devicetree/bindings/iio/adc/ad7606.txt
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt
  
  ANALOG DEVICES INC AD7768-1 DRIVER
  M:    Stefan Popa <stefan.popa@analog.com>
@@@ -951,7 -950,6 +951,7 @@@ F: drivers/dma/dma-axi-dmac.
  ANALOG DEVICES INC IIO DRIVERS
  M:    Lars-Peter Clausen <lars@metafoo.de>
  M:    Michael Hennerich <Michael.Hennerich@analog.com>
 +M:    Stefan Popa <stefan.popa@analog.com>
  W:    http://wiki.analog.com/
  W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
@@@ -1418,9 -1416,7 +1418,9 @@@ M:      Manivannan Sadhasivam <manivannan.sa
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm64/boot/dts/bitmain/
 +F:    drivers/pinctrl/pinctrl-bm1880.c
  F:    Documentation/devicetree/bindings/arm/bitmain.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt
  
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <robh@kernel.org>
@@@ -1897,15 -1893,14 +1897,15 @@@ T:   git git://git.kernel.org/pub/scm/lin
  ARM/NUVOTON NPCM ARCHITECTURE
  M:    Avi Fishman <avifishman70@gmail.com>
  M:    Tomer Maimon <tmaimon77@gmail.com>
 +M:    Tali Perry <tali.perry1@gmail.com>
  R:    Patrick Venture <venture@google.com>
  R:    Nancy Yuen <yuenn@google.com>
 -R:    Brendan Higgins <brendanhiggins@google.com>
 +R:    Benjamin Fair <benjaminfair@google.com>
  L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm/mach-npcm/
  F:    arch/arm/boot/dts/nuvoton-npcm*
 -F:    include/dt-bindings/clock/nuvoton,npcm7xx-clks.h
 +F:    include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
  F:    drivers/*/*npcm*
  F:    Documentation/devicetree/bindings/*/*npcm*
  F:    Documentation/devicetree/bindings/*/*/*npcm*
@@@ -2361,7 -2356,7 +2361,7 @@@ F:      arch/arm/mm/cache-uniphier.
  F:    arch/arm64/boot/dts/socionext/uniphier*
  F:    drivers/bus/uniphier-system-bus.c
  F:    drivers/clk/uniphier/
 -F:    drivers/dmaengine/uniphier-mdmac.c
 +F:    drivers/dma/uniphier-mdmac.c
  F:    drivers/gpio/gpio-uniphier.c
  F:    drivers/i2c/busses/i2c-uniphier*
  F:    drivers/irqchip/irq-uniphier-aidet.c
@@@ -2517,7 -2512,7 +2517,7 @@@ ASC7621 HARDWARE MONITOR DRIVE
  M:    George Joseph <george.joseph@fairview5.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/asc7621
 +F:    Documentation/hwmon/asc7621.rst
  F:    drivers/hwmon/asc7621.c
  
  ASPEED VIDEO ENGINE DRIVER
@@@ -2798,13 -2793,10 +2798,13 @@@ M:   Simon Wunderlich <sw@simonwunderlich
  M:    Antonio Quartulli <a@unstable.cc>
  L:    b.a.t.m.a.n@lists.open-mesh.org (moderated for non-subscribers)
  W:    https://www.open-mesh.org/
 +B:    https://www.open-mesh.org/projects/batman-adv/issues
 +C:    irc://chat.freenode.net/batman
  Q:    https://patchwork.open-mesh.org/project/batman/list/
 +T:    git https://git.open-mesh.org/linux-merge.git
  S:    Maintained
 -F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
 -F:    Documentation/ABI/testing/sysfs-class-net-mesh
 +F:    Documentation/ABI/obsolete/sysfs-class-net-batman-adv
 +F:    Documentation/ABI/obsolete/sysfs-class-net-mesh
  F:    Documentation/networking/batman-adv.rst
  F:    include/uapi/linux/batadv_packet.h
  F:    include/uapi/linux/batman_adv.h
@@@ -3128,7 -3120,6 +3128,7 @@@ F:      drivers/cpufreq/bmips-cpufreq.
  BROADCOM BMIPS MIPS ARCHITECTURE
  M:    Kevin Cernekee <cernekee@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
 +L:    bcm-kernel-feedback-list@broadcom.com
  L:    linux-mips@vger.kernel.org
  T:    git git://github.com/broadcom/stblinux.git
  S:    Maintained
@@@ -3737,8 -3728,8 +3737,8 @@@ F:      scripts/checkpatch.p
  
  CHINESE DOCUMENTATION
  M:    Harry Wei <harryxiyou@gmail.com>
+ M:    Alex Shi <alex.shi@linux.alibaba.com>
  L:    xiyoulinuxkernelgroup@googlegroups.com (subscribers-only)
- L:    linux-kernel@zh-kernel.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/translations/zh_CN/
  
@@@ -3805,7 -3796,6 +3805,7 @@@ M:      Richard Fitzgerald <rf@opensource.ci
  L:    patches@opensource.cirrus.com
  S:    Supported
  F:    drivers/clk/clk-lochnagar.c
 +F:    drivers/hwmon/lochnagar-hwmon.c
  F:    drivers/mfd/lochnagar-i2c.c
  F:    drivers/pinctrl/cirrus/pinctrl-lochnagar.c
  F:    drivers/regulator/lochnagar-regulator.c
@@@ -3814,10 -3804,8 +3814,10 @@@ F:    include/dt-bindings/pinctrl/lochnaga
  F:    include/linux/mfd/lochnagar*
  F:    Documentation/devicetree/bindings/mfd/cirrus,lochnagar.txt
  F:    Documentation/devicetree/bindings/clock/cirrus,lochnagar.txt
 +F:    Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt
  F:    Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt
  F:    Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
 +F:    Documentation/hwmon/lochnagar
  
  CISCO FCOE HBA DRIVER
  M:    Satish Kharat <satishkh@cisco.com>
@@@ -4055,7 -4043,7 +4055,7 @@@ CORETEMP HARDWARE MONITORING DRIVE
  M:    Fenghua Yu <fenghua.yu@intel.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/coretemp
 +F:    Documentation/hwmon/coretemp.rst
  F:    drivers/hwmon/coretemp.c
  
  COSA/SRP SYNC SERIAL DRIVER
@@@ -4064,16 -4052,6 +4064,16 @@@ W:    http://www.fi.muni.cz/~kas/cosa
  S:    Maintained
  F:    drivers/net/wan/cosa*
  
 +COUNTER SUBSYSTEM
 +M:    William Breathitt Gray <vilhelm.gray@gmail.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-counter*
 +F:    Documentation/driver-api/generic-counter.rst
 +F:    drivers/counter/
 +F:    include/linux/counter.h
 +F:    include/linux/counter_enum.h
 +
  CPMAC ETHERNET DRIVER
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    netdev@vger.kernel.org
@@@ -4151,7 -4129,7 +4151,7 @@@ F:      drivers/cpuidle/
  F:    include/linux/cpuidle.h
  
  CRAMFS FILESYSTEM
 -M:    Nicolas Pitre <nico@linaro.org>
 +M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Maintained
  F:    Documentation/filesystems/cramfs.txt
  F:    fs/cramfs/
@@@ -4573,7 -4551,6 +4573,7 @@@ S:      Maintaine
  F:    drivers/devfreq/
  F:    include/linux/devfreq.h
  F:    Documentation/devicetree/bindings/devfreq/
 +F:    include/trace/events/devfreq.h
  
  DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)
  M:    Chanwoo Choi <cw00.choi@samsung.com>
@@@ -4621,7 -4598,7 +4621,7 @@@ DIALOG SEMICONDUCTOR DRIVER
  M:    Support Opensource <support.opensource@diasemi.com>
  W:    http://www.dialog-semiconductor.com/products
  S:    Supported
 -F:    Documentation/hwmon/da90??
 +F:    Documentation/hwmon/da90??.rst
  F:    Documentation/devicetree/bindings/mfd/da90*.txt
  F:    Documentation/devicetree/bindings/input/da90??-onkey.txt
  F:    Documentation/devicetree/bindings/thermal/da90??-thermal.txt
@@@ -4772,7 -4749,7 +4772,7 @@@ DME1737 HARDWARE MONITOR DRIVE
  M:    Juerg Haefliger <juergh@gmail.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/dme1737
 +F:    Documentation/hwmon/dme1737.rst
  F:    drivers/hwmon/dme1737.c
  
  DMI/SMBIOS SUPPORT
@@@ -5619,12 -5596,6 +5619,12 @@@ L:    linux-edac@vger.kernel.or
  S:    Maintained
  F:    drivers/edac/ghes_edac.c
  
 +EDAC-I10NM
 +M:    Tony Luck <tony.luck@intel.com>
 +L:    linux-edac@vger.kernel.org
 +S:    Maintained
 +F:    drivers/edac/i10nm_base.c
 +
  EDAC-I3000
  L:    linux-edac@vger.kernel.org
  S:    Orphan
@@@ -5706,7 -5677,7 +5706,7 @@@ EDAC-SKYLAK
  M:    Tony Luck <tony.luck@intel.com>
  L:    linux-edac@vger.kernel.org
  S:    Maintained
 -F:    drivers/edac/skx_edac.c
 +F:    drivers/edac/skx_*.c
  
  EDAC-TI
  M:    Tero Kristo <t-kristo@ti.com>
@@@ -5862,7 -5833,7 +5862,7 @@@ L:      netdev@vger.kernel.or
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-mdio
  F:    Documentation/devicetree/bindings/net/mdio*
 -F:    Documentation/networking/phy.txt
 +F:    Documentation/networking/phy.rst
  F:    drivers/net/phy/
  F:    drivers/of/of_mdio.c
  F:    drivers/of/of_net.c
@@@ -5964,7 -5935,7 +5964,7 @@@ F71805F HARDWARE MONITORING DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/f71805f
 +F:    Documentation/hwmon/f71805f.rst
  F:    drivers/hwmon/f71805f.c
  
  FADDR2LINE
@@@ -6437,6 -6408,7 +6437,6 @@@ L:      linux-kernel@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
  S:    Maintained
  F:    kernel/futex.c
 -F:    kernel/futex_compat.c
  F:    include/asm-generic/futex.h
  F:    include/linux/futex.h
  F:    include/uapi/linux/futex.h
@@@ -6489,7 -6461,7 +6489,7 @@@ S:      Maintaine
  F:    drivers/media/radio/radio-gemtek*
  
  GENERIC GPIO I2C DRIVER
 -M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
 +M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
  S:    Supported
  F:    drivers/i2c/busses/i2c-gpio.c
  F:    include/linux/platform_data/i2c-gpio.h
@@@ -6621,7 -6593,7 +6621,7 @@@ M:      Andy Shevchenko <andriy.shevchenko@l
  L:    linux-gpio@vger.kernel.org
  L:    linux-acpi@vger.kernel.org
  S:    Maintained
 -F:    Documentation/acpi/gpio-properties.txt
 +F:    Documentation/firmware-guide/acpi/gpio-properties.rst
  F:    drivers/gpio/gpiolib-acpi.c
  
  GPIO IR Transmitter
@@@ -7361,6 -7333,7 +7361,6 @@@ F:      Documentation/devicetree/bindings/i3
  F:    Documentation/driver-api/i3c
  F:    drivers/i3c/
  F:    include/linux/i3c/
 -F:    include/dt-bindings/i3c/
  
  I3C DRIVER FOR SYNOPSYS DESIGNWARE
  M:    Vitor Soares <vitor.soares@synopsys.com>
@@@ -7543,7 -7516,7 +7543,7 @@@ F:      include/net/mac802154.
  F:    include/net/af_ieee802154.h
  F:    include/net/cfg802154.h
  F:    include/net/ieee802154_netdev.h
 -F:    Documentation/networking/ieee802154.txt
 +F:    Documentation/networking/ieee802154.rst
  
  IFE PROTOCOL
  M:    Yotam Gigi <yotam.gi@gmail.com>
@@@ -7645,7 -7618,7 +7645,7 @@@ INA209 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/ina209
 +F:    Documentation/hwmon/ina209.rst
  F:    Documentation/devicetree/bindings/hwmon/ina2xx.txt
  F:    drivers/hwmon/ina209.c
  
@@@ -7653,7 -7626,7 +7653,7 @@@ INA2XX HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/ina2xx
 +F:    Documentation/hwmon/ina2xx.rst
  F:    drivers/hwmon/ina2xx.c
  F:    include/linux/platform_data/ina2xx.h
  
@@@ -8073,7 -8046,6 +8073,7 @@@ F:      drivers/gpio/gpio-intel-mid.
  
  INTERCONNECT API
  M:    Georgi Djakov <georgi.djakov@linaro.org>
 +L:    linux-pm@vger.kernel.org
  S:    Maintained
  F:    Documentation/interconnect/
  F:    Documentation/devicetree/bindings/interconnect/
@@@ -8124,16 -8096,6 +8124,16 @@@ F:    include/linux/iommu.
  F:    include/linux/of_iommu.h
  F:    include/linux/iova.h
  
 +IO_URING
 +M:    Jens Axboe <axboe@kernel.dk>
 +L:    linux-block@vger.kernel.org
 +L:    linux-fsdevel@vger.kernel.org
 +T:    git git://git.kernel.dk/linux-block
 +T:    git git://git.kernel.dk/liburing
 +S:    Maintained
 +F:    fs/io_uring.c
 +F:    include/uapi/linux/io_uring.h
 +
  IP MASQUERADING
  M:    Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
  S:    Maintained
@@@ -8282,7 -8244,7 +8282,7 @@@ IT87 HARDWARE MONITORING DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/it87
 +F:    Documentation/hwmon/it87.rst
  F:    drivers/hwmon/it87.c
  
  IT913X MEDIA DRIVER
@@@ -8326,7 -8288,7 +8326,7 @@@ M:      Guenter Roeck <linux@roeck-us.net
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
  F:    drivers/hwmon/jc42.c
 -F:    Documentation/hwmon/jc42
 +F:    Documentation/hwmon/jc42.rst
  
  JFS FILESYSTEM
  M:    Dave Kleikamp <shaggy@kernel.org>
@@@ -8374,14 -8336,14 +8374,14 @@@ K10TEMP HARDWARE MONITORING DRIVE
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/k10temp
 +F:    Documentation/hwmon/k10temp.rst
  F:    drivers/hwmon/k10temp.c
  
  K8TEMP HARDWARE MONITORING DRIVER
  M:    Rudolf Marek <r.marek@assembler.cz>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/k8temp
 +F:    Documentation/hwmon/k8temp.rst
  F:    drivers/hwmon/k8temp.c
  
  KASAN
@@@ -8736,7 -8698,6 +8736,7 @@@ F:      scripts/leaking_addresses.p
  LED SUBSYSTEM
  M:    Jacek Anaszewski <jacek.anaszewski@gmail.com>
  M:    Pavel Machek <pavel@ucw.cz>
 +R:    Dan Murphy <dmurphy@ti.com>
  L:    linux-leds@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
  S:    Maintained
@@@ -9022,7 -8983,7 +9022,7 @@@ R:      Daniel Lustig <dlustig@nvidia.com
  L:    linux-kernel@vger.kernel.org
  L:    linux-arch@vger.kernel.org
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    tools/memory-model/
  F:    Documentation/atomic_bitops.txt
  F:    Documentation/atomic_t.txt
@@@ -9073,21 -9034,21 +9073,21 @@@ LM78 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/lm78
 +F:    Documentation/hwmon/lm78.rst
  F:    drivers/hwmon/lm78.c
  
  LM83 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/lm83
 +F:    Documentation/hwmon/lm83.rst
  F:    drivers/hwmon/lm83.c
  
  LM90 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/lm90
 +F:    Documentation/hwmon/lm90.rst
  F:    Documentation/devicetree/bindings/hwmon/lm90.txt
  F:    drivers/hwmon/lm90.c
  F:    include/dt-bindings/thermal/lm90.h
@@@ -9096,7 -9057,7 +9096,7 @@@ LM95234 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/lm95234
 +F:    Documentation/hwmon/lm95234.rst
  F:    drivers/hwmon/lm95234.c
  
  LME2510 MEDIA DRIVER
@@@ -9128,6 -9089,7 +9128,6 @@@ F:      arch/*/include/asm/spinlock*.
  F:    include/linux/rwlock*.h
  F:    include/linux/mutex*.h
  F:    include/linux/rwsem*.h
 -F:    arch/*/include/asm/rwsem.h
  F:    include/linux/seqlock.h
  F:    lib/locking*.[ch]
  F:    kernel/locking/
@@@ -9169,7 -9131,7 +9169,7 @@@ LTC4261 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/ltc4261
 +F:    Documentation/hwmon/ltc4261.rst
  F:    drivers/hwmon/ltc4261.c
  
  LTC4306 I2C MULTIPLEXER DRIVER
@@@ -9400,7 -9362,7 +9400,7 @@@ MAX16065 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/max16065
 +F:    Documentation/hwmon/max16065.rst
  F:    drivers/hwmon/max16065.c
  
  MAX2175 SDR TUNER DRIVER
@@@ -9416,14 -9378,14 +9416,14 @@@ F:   include/uapi/linux/max2175.
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  L:    linux-hwmon@vger.kernel.org
  S:    Orphan
 -F:    Documentation/hwmon/max6650
 +F:    Documentation/hwmon/max6650.rst
  F:    drivers/hwmon/max6650.c
  
  MAX6697 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/max6697
 +F:    Documentation/hwmon/max6697.rst
  F:    Documentation/devicetree/bindings/hwmon/max6697.txt
  F:    drivers/hwmon/max6697.c
  F:    include/linux/platform_data/max6697.h
@@@ -9435,13 -9397,6 +9435,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/sound/max9860.txt
  F:    sound/soc/codecs/max9860.*
  
 +MAXBOTIX ULTRASONIC RANGER IIO DRIVER
 +M:    Andreas Klinger <ak@it-klinger.de>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt
 +F:    drivers/iio/proximity/mb1232.c
 +
  MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
  M:    Javier Martinez Canillas <javier@dowhile0.org>
  L:    linux-kernel@vger.kernel.org
@@@ -9810,17 -9765,9 +9810,17 @@@ F:    drivers/media/platform/mtk-vpu
  F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
  F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
  
 +MEDIATEK MMC/SD/SDIO DRIVER
 +M:    Chaotian Jing <chaotian.jing@mediatek.com>
 +S:    Maintained
 +F:    drivers/mmc/host/mtk-sd.c
 +F:    Documentation/devicetree/bindings/mmc/mtk-sd.txt
 +
  MEDIATEK MT76 WIRELESS LAN DRIVER
  M:    Felix Fietkau <nbd@nbd.name>
  M:    Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
 +R:    Ryder Lee <ryder.lee@mediatek.com>
 +R:    Roy Luo <royluo@google.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt76/
@@@ -9919,6 -9866,15 +9919,6 @@@ F:     drivers/net/ethernet/mellanox/mlx5/c
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
  
 -MELLANOX ETHERNET INNOVA IPSEC DRIVER
 -R:    Boris Pismenny <borisp@mellanox.com>
 -L:    netdev@vger.kernel.org
 -S:    Supported
 -W:    http://www.mellanox.com
 -Q:    http://patchwork.ozlabs.org/project/netdev/list/
 -F:    drivers/net/ethernet/mellanox/mlx5/core/en_ipsec/*
 -F:    drivers/net/ethernet/mellanox/mlx5/core/ipsec*
 -
  MELLANOX ETHERNET SWITCH DRIVERS
  M:    Jiri Pirko <jiri@mellanox.com>
  M:    Ido Schimmel <idosch@mellanox.com>
@@@ -10075,7 -10031,7 +10075,7 @@@ F:   drivers/mfd/menf21bmc.
  F:    drivers/watchdog/menf21bmc_wdt.c
  F:    drivers/leds/leds-menf21bmc.c
  F:    drivers/hwmon/menf21bmc_hwmon.c
 -F:    Documentation/hwmon/menf21bmc
 +F:    Documentation/hwmon/menf21bmc.rst
  
  MEN Z069 WATCHDOG DRIVER
  M:    Johannes Thumshirn <jth@kernel.org>
@@@ -10090,7 -10046,6 +10090,7 @@@ L:   linux-amlogic@lists.infradead.or
  W:    http://linux-meson.com/
  S:    Supported
  F:    drivers/media/platform/meson/ao-cec.c
 +F:    drivers/media/platform/meson/ao-cec-g12a.c
  F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:    git git://linuxtv.org/media_tree.git
  
@@@ -10180,7 -10135,7 +10180,7 @@@ F:   drivers/spi/spi-at91-usart.
  F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
  
  MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
 -M:    Woojung Huh <Woojung.Huh@microchip.com>
 +M:    Woojung Huh <woojung.huh@microchip.com>
  M:    Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -10469,7 -10424,7 +10469,7 @@@ F:   include/uapi/linux/meye.
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  M:    Jiri Slaby <jirislaby@gmail.com>
  S:    Maintained
 -F:    Documentation/serial/moxa-smartio
 +F:    Documentation/serial/moxa-smartio.rst
  F:    drivers/tty/mxser.*
  
  MR800 AVERMEDIA USB FM RADIO DRIVER
@@@ -10704,7 -10659,7 +10704,7 @@@ NCT6775 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/nct6775
 +F:    Documentation/hwmon/nct6775.rst
  F:    drivers/hwmon/nct6775.c
  
  NET_FAILOVER MODULE
@@@ -10782,7 -10737,6 +10782,7 @@@ L:   linux-block@vger.kernel.or
  L:    nbd@other.debian.org
  F:    Documentation/blockdev/nbd.txt
  F:    drivers/block/nbd.c
 +F:    include/trace/events/nbd.h
  F:    include/uapi/linux/nbd.h
  
  NETWORK DROP MONITOR
@@@ -11153,16 -11107,6 +11153,16 @@@ F: Documentation/ABI/stable/sysfs-bus-n
  F:    include/linux/nvmem-consumer.h
  F:    include/linux/nvmem-provider.h
  
 +NXP FXAS21002C DRIVER
 +M:    Rui Miguel Silva <rmfrfs@gmail.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/gyroscope/fxas21002c.txt
 +F:    drivers/iio/gyro/fxas21002c_core.c
 +F:    drivers/iio/gyro/fxas21002c.h
 +F:    drivers/iio/gyro/fxas21002c_i2c.c
 +F:    drivers/iio/gyro/fxas21002c_spi.c
 +
  NXP SGTL5000 DRIVER
  M:    Fabio Estevam <festevam@gmail.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -11170,12 -11114,6 +11170,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
  F:    sound/soc/codecs/sgtl5000*
  
 +NXP SJA1105 ETHERNET SWITCH DRIVER
 +M:    Vladimir Oltean <olteanv@gmail.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/dsa/sja1105
 +
  NXP TDA998X DRM DRIVER
  M:    Russell King <linux@armlinux.org.uk>
  S:    Maintained
@@@ -11729,14 -11667,6 +11729,14 @@@ L: linux-i2c@vger.kernel.or
  S:    Orphan
  F:    drivers/i2c/busses/i2c-pasemi.c
  
 +PACKING
 +M:    Vladimir Oltean <olteanv@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    lib/packing.c
 +F:    include/linux/packing.h
 +F:    Documentation/packing.txt
 +
  PADATA PARALLEL EXECUTION MECHANISM
  M:    Steffen Klassert <steffen.klassert@secunet.com>
  L:    linux-crypto@vger.kernel.org
@@@ -11823,7 -11753,7 +11823,7 @@@ PC87360 HARDWARE MONITORING DRIVE
  M:    Jim Cromie <jim.cromie@gmail.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/pc87360
 +F:    Documentation/hwmon/pc87360.rst
  F:    drivers/hwmon/pc87360.c
  
  PC8736x GPIO DRIVER
@@@ -11835,7 -11765,7 +11835,7 @@@ PC87427 HARDWARE MONITORING DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/pc87427
 +F:    Documentation/hwmon/pc87427.rst
  F:    drivers/hwmon/pc87427.c
  
  PCA9532 LED DRIVER
@@@ -12235,7 -12165,6 +12235,7 @@@ F:   arch/*/kernel/*/*/perf_event*.
  F:    arch/*/include/asm/perf_event.h
  F:    arch/*/kernel/perf_callchain.c
  F:    arch/*/events/*
 +F:    arch/*/events/*/*
  F:    tools/perf/
  
  PERSONALITY HANDLING
@@@ -12404,23 -12333,23 +12404,23 @@@ S:        Maintaine
  F:    Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
  F:    Documentation/devicetree/bindings/hwmon/max31785.txt
  F:    Documentation/devicetree/bindings/hwmon/ltc2978.txt
 -F:    Documentation/hwmon/adm1275
 -F:    Documentation/hwmon/ibm-cffps
 -F:    Documentation/hwmon/ir35221
 -F:    Documentation/hwmon/lm25066
 -F:    Documentation/hwmon/ltc2978
 -F:    Documentation/hwmon/ltc3815
 -F:    Documentation/hwmon/max16064
 -F:    Documentation/hwmon/max20751
 -F:    Documentation/hwmon/max31785
 -F:    Documentation/hwmon/max34440
 -F:    Documentation/hwmon/max8688
 -F:    Documentation/hwmon/pmbus
 -F:    Documentation/hwmon/pmbus-core
 -F:    Documentation/hwmon/tps40422
 -F:    Documentation/hwmon/ucd9000
 -F:    Documentation/hwmon/ucd9200
 -F:    Documentation/hwmon/zl6100
 +F:    Documentation/hwmon/adm1275.rst
 +F:    Documentation/hwmon/ibm-cffps.rst
 +F:    Documentation/hwmon/ir35221.rst
 +F:    Documentation/hwmon/lm25066.rst
 +F:    Documentation/hwmon/ltc2978.rst
 +F:    Documentation/hwmon/ltc3815.rst
 +F:    Documentation/hwmon/max16064.rst
 +F:    Documentation/hwmon/max20751.rst
 +F:    Documentation/hwmon/max31785.rst
 +F:    Documentation/hwmon/max34440.rst
 +F:    Documentation/hwmon/max8688.rst
 +F:    Documentation/hwmon/pmbus.rst
 +F:    Documentation/hwmon/pmbus-core.rst
 +F:    Documentation/hwmon/tps40422.rst
 +F:    Documentation/hwmon/ucd9000.rst
 +F:    Documentation/hwmon/ucd9200.rst
 +F:    Documentation/hwmon/zl6100.rst
  F:    drivers/hwmon/pmbus/
  F:    include/linux/pmbus.h
  
@@@ -12476,7 -12405,7 +12476,7 @@@ M:   Mark Rutland <mark.rutland@arm.com
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
 -F:    drivers/firmware/psci*.c
 +F:    drivers/firmware/psci/
  F:    include/linux/psci.h
  F:    include/uapi/linux/psci.h
  
@@@ -12684,7 -12613,7 +12684,7 @@@ M:   Bartlomiej Zolnierkiewicz <b.zolnier
  L:    linux-hwmon@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/hwmon/pwm-fan.txt
 -F:    Documentation/hwmon/pwm-fan
 +F:    Documentation/hwmon/pwm-fan.rst
  F:    drivers/hwmon/pwm-fan.c
  
  PWM IR Transmitter
@@@ -13102,9 -13031,9 +13102,9 @@@ M:   Josh Triplett <josh@joshtriplett.org
  R:    Steven Rostedt <rostedt@goodmis.org>
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  R:    Lai Jiangshan <jiangshanlai@gmail.com>
 -L:    linux-kernel@vger.kernel.org
 +L:    rcu@vger.kernel.org
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    tools/testing/selftests/rcutorture
  
  RDC R-321X SoC
@@@ -13150,10 -13079,10 +13150,10 @@@ R:        Steven Rostedt <rostedt@goodmis.org
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  R:    Lai Jiangshan <jiangshanlai@gmail.com>
  R:    Joel Fernandes <joel@joelfernandes.org>
 -L:    linux-kernel@vger.kernel.org
 +L:    rcu@vger.kernel.org
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/RCU/
  X:    Documentation/RCU/torture.txt
  F:    include/linux/rcu*
@@@ -13379,7 -13308,7 +13379,7 @@@ ROCKETPORT DRIVE
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
  S:    Maintained
 -F:    Documentation/serial/rocket.txt
 +F:    Documentation/serial/rocket.rst
  F:    drivers/tty/rocket*
  
  ROCKETPORT EXPRESS/INFINITY DRIVER
@@@ -13463,12 -13392,6 +13463,12 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtlwifi/
  
 +REALTEK WIRELESS DRIVER (rtw88)
 +M:    Yan-Hsuan Chuang <yhchuang@realtek.com>
 +L:    linux-wireless@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/wireless/realtek/rtw88/
 +
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <Jes.Sorensen@gmail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -14014,7 -13937,7 +14014,7 @@@ W:   https://selinuxproject.or
  W:    https://github.com/SELinuxProject
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
  S:    Supported
 -F:    include/linux/selinux*
 +F:    include/uapi/linux/selinux_netlink.h
  F:    security/selinux/
  F:    scripts/selinux/
  F:    Documentation/admin-guide/LSM/SELinux.rst
@@@ -14049,7 -13972,7 +14049,7 @@@ F:   drivers/media/rc/serial_ir.
  SFC NETWORK DRIVER
  M:    Solarflare linux maintainers <linux-net-drivers@solarflare.com>
  M:    Edward Cree <ecree@solarflare.com>
 -M:    Bert Kenward <bkenward@solarflare.com>
 +M:    Martin Habets <mhabets@solarflare.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/sfc/
@@@ -14311,10 -14234,10 +14311,10 @@@ M:        "Paul E. McKenney" <paulmck@linux.ib
  M:    Josh Triplett <josh@joshtriplett.org>
  R:    Steven Rostedt <rostedt@goodmis.org>
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 -L:    linux-kernel@vger.kernel.org
 +L:    rcu@vger.kernel.org
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    include/linux/srcu*.h
  F:    kernel/rcu/srcu*.c
  
@@@ -14355,21 -14278,21 +14355,21 @@@ SMM665 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/smm665
 +F:    Documentation/hwmon/smm665.rst
  F:    drivers/hwmon/smm665.c
  
  SMSC EMC2103 HARDWARE MONITOR DRIVER
  M:    Steve Glendinning <steve.glendinning@shawell.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/emc2103
 +F:    Documentation/hwmon/emc2103.rst
  F:    drivers/hwmon/emc2103.c
  
  SMSC SCH5627 HARDWARE MONITOR DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Supported
 -F:    Documentation/hwmon/sch5627
 +F:    Documentation/hwmon/sch5627.rst
  F:    drivers/hwmon/sch5627.c
  
  SMSC UFX6000 and UFX7000 USB to VGA DRIVER
@@@ -14382,7 -14305,7 +14382,7 @@@ SMSC47B397 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/smsc47b397
 +F:    Documentation/hwmon/smsc47b397.rst
  F:    drivers/hwmon/smsc47b397.c
  
  SMSC911x ETHERNET DRIVER
@@@ -14402,8 -14325,9 +14402,8 @@@ SOC-CAMERA V4L2 SUBSYSTE
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Orphan
 -F:    include/media/soc*
 -F:    drivers/media/i2c/soc_camera/
 -F:    drivers/media/platform/soc_camera/
 +F:    include/media/soc_camera.h
 +F:    drivers/staging/media/soc_camera/
  
  SOCIONEXT SYNQUACER I2C DRIVER
  M:    Ard Biesheuvel <ard.biesheuvel@linaro.org>
@@@ -14539,15 -14463,16 +14539,15 @@@ T:        git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/i2c/imx355.c
  
 -SONY MEMORYSTICK CARD SUPPORT
 -M:    Alex Dubov <oakad@yahoo.com>
 -W:    http://tifmxx.berlios.de/
 -S:    Maintained
 -F:    drivers/memstick/host/tifm_ms.c
 -
 -SONY MEMORYSTICK STANDARD SUPPORT
 +SONY MEMORYSTICK SUBSYSTEM
  M:    Maxim Levitsky <maximlevitsky@gmail.com>
 +M:    Alex Dubov <oakad@yahoo.com>
 +M:    Ulf Hansson <ulf.hansson@linaro.org>
 +L:    linux-mmc@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
  S:    Maintained
 -F:    drivers/memstick/core/ms_block.*
 +F:    drivers/memstick/
 +F:    include/linux/memstick.h
  
  SONY VAIO CONTROL DEVICE DRIVER
  M:    Mattia Dongili <malattia@linux.it>
@@@ -14743,14 -14668,6 +14743,14 @@@ S: Maintaine
  F:    drivers/iio/imu/st_lsm6dsx/
  F:    Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt
  
 +ST MIPID02 CSI-2 TO PARALLEL BRIDGE DRIVER
 +M:    Mickael Guene <mickael.guene@st.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/st-mipid02.c
 +F:    Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt
 +
  ST STM32 I2C/SMBUS DRIVER
  M:    Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
  L:    linux-i2c@vger.kernel.org
@@@ -15387,11 -15304,6 +15387,11 @@@ M: Laxman Dewangan <ldewangan@nvidia.co
  S:    Supported
  F:    drivers/spi/spi-tegra*
  
 +TEGRA XUSB PADCTL DRIVER
 +M:    JC Kuo <jckuo@nvidia.com>
 +S:    Supported
 +F:    drivers/phy/tegra/xusb*
 +
  TEHUTI ETHERNET DRIVER
  M:    Andy Gospodarek <andy@greyhouse.net>
  L:    netdev@vger.kernel.org
@@@ -15585,11 -15497,9 +15585,11 @@@ S: Maintaine
  F:    drivers/net/ethernet/ti/cpsw*
  F:    drivers/net/ethernet/ti/davinci*
  
 -TI FLASH MEDIA INTERFACE DRIVER
 +TI FLASH MEDIA MEMORYSTICK/MMC DRIVERS
  M:    Alex Dubov <oakad@yahoo.com>
  S:    Maintained
 +W:    http://tifmxx.berlios.de/
 +F:    drivers/memstick/host/tifm_ms.c
  F:    drivers/misc/tifm*
  F:    drivers/mmc/host/tifm_sd.c
  F:    include/linux/tifm.h
@@@ -15741,7 -15651,7 +15741,7 @@@ TMP401 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/tmp401
 +F:    Documentation/hwmon/tmp401.rst
  F:    drivers/hwmon/tmp401.c
  
  TMPFS (SHMEM FILESYSTEM)
@@@ -15774,7 -15684,7 +15774,7 @@@ M:   "Paul E. McKenney" <paulmck@linux.ib
  M:    Josh Triplett <josh@joshtriplett.org>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/RCU/torture.txt
  F:    kernel/torture.c
  F:    kernel/rcu/rcutorture.c
@@@ -16016,12 -15926,6 +16016,12 @@@ F: drivers/uwb
  F:    include/linux/uwb.h
  F:    include/linux/uwb/
  
 +UNICODE SUBSYSTEM:
 +M:    Gabriel Krisman Bertazi <krisman@collabora.com>
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Supported
 +F:    fs/unicode/
 +
  UNICORE32 ARCHITECTURE:
  M:    Guan Xuetao <gxt@pku.edu.cn>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
@@@ -16067,13 -15971,6 +16067,13 @@@ L: linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/ufs/*dwc*
  
 +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS
 +M:    Stanley Chu <stanley.chu@mediatek.com>
 +L:    linux-scsi@vger.kernel.org
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/scsi/ufs/ufs-mediatek*
 +
  UNSORTED BLOCK IMAGES (UBI)
  M:    Artem Bityutskiy <dedekind1@gmail.com>
  M:    Richard Weinberger <richard@nod.at>
@@@ -16177,14 -16074,6 +16177,14 @@@ L: linux-usb@vger.kernel.or
  S:    Maintained
  F:    drivers/usb/roles/intel-xhci-usb-role-switch.c
  
 +USB IP DRIVER FOR HISILICON KIRIN
 +M:    Yu Chen <chenyu56@huawei.com>
 +M:    Binghui Wang <wangbinghui@hisilicon.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt
 +F:    drivers/phy/hisilicon/phy-hi3660-usb3.c
 +
  USB ISP116X DRIVER
  M:    Olav Kongas <ok@artecdesign.ee>
  L:    linux-usb@vger.kernel.org
@@@ -16610,7 -16499,7 +16610,7 @@@ F:   drivers/char/virtio_console.
  F:    include/linux/virtio_console.h
  F:    include/uapi/linux/virtio_console.h
  
 -VIRTIO CORE, NET AND BLOCK DRIVERS
 +VIRTIO CORE AND NET DRIVERS
  M:    "Michael S. Tsirkin" <mst@redhat.com>
  M:    Jason Wang <jasowang@redhat.com>
  L:    virtualization@lists.linux-foundation.org
@@@ -16625,19 -16514,6 +16625,19 @@@ F: include/uapi/linux/virtio_*.
  F:    drivers/crypto/virtio/
  F:    mm/balloon_compaction.c
  
 +VIRTIO BLOCK AND SCSI DRIVERS
 +M:    "Michael S. Tsirkin" <mst@redhat.com>
 +M:    Jason Wang <jasowang@redhat.com>
 +R:    Paolo Bonzini <pbonzini@redhat.com>
 +R:    Stefan Hajnoczi <stefanha@redhat.com>
 +L:    virtualization@lists.linux-foundation.org
 +S:    Maintained
 +F:    drivers/block/virtio_blk.c
 +F:    drivers/scsi/virtio_scsi.c
 +F:    include/uapi/linux/virtio_blk.h
 +F:    include/uapi/linux/virtio_scsi.h
 +F:    drivers/vhost/scsi.c
 +
  VIRTIO CRYPTO DRIVER
  M:    Gonglei <arei.gonglei@huawei.com>
  L:    virtualization@lists.linux-foundation.org
@@@ -16800,7 -16676,7 +16800,7 @@@ VT1211 HARDWARE MONITOR DRIVE
  M:    Juerg Haefliger <juergh@gmail.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/vt1211
 +F:    Documentation/hwmon/vt1211.rst
  F:    drivers/hwmon/vt1211.c
  
  VT8231 HARDWARE MONITOR DRIVER
@@@ -16828,14 -16704,14 +16828,14 @@@ W83791D HARDWARE MONITORING DRIVE
  M:    Marc Hulsman <m.hulsman@tudelft.nl>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/w83791d
 +F:    Documentation/hwmon/w83791d.rst
  F:    drivers/hwmon/w83791d.c
  
  W83793 HARDWARE MONITORING DRIVER
  M:    Rudolf Marek <r.marek@assembler.cz>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/hwmon/w83793
 +F:    Documentation/hwmon/w83793.rst
  F:    drivers/hwmon/w83793.c
  
  W83795 HARDWARE MONITORING DRIVER
@@@ -16944,7 -16820,7 +16944,7 @@@ L:   patches@opensource.cirrus.co
  T:    git https://github.com/CirrusLogic/linux-drivers.git
  W:    https://github.com/CirrusLogic/linux-drivers/wiki
  S:    Supported
 -F:    Documentation/hwmon/wm83??
 +F:    Documentation/hwmon/wm83??.rst
  F:    Documentation/devicetree/bindings/extcon/extcon-arizona.txt
  F:    Documentation/devicetree/bindings/regulator/arizona-regulator.txt
  F:    Documentation/devicetree/bindings/mfd/arizona.txt
@@@ -17034,7 -16910,7 +17034,7 @@@ M:   Tony Luck <tony.luck@intel.com
  M:    Borislav Petkov <bp@alien8.de>
  L:    linux-edac@vger.kernel.org
  S:    Maintained
 -F:    arch/x86/kernel/cpu/mcheck/*
 +F:    arch/x86/kernel/cpu/mce/*
  
  X86 MICROCODE UPDATE SUPPORT
  M:    Borislav Petkov <bp@alien8.de>

diff --combined scripts/checkpatch.pl
index a09333fd7cef81053bf204dd03a4db07bbb833ef,bbe71f017f6dc26bf4033d2f2a844d0e7f2981d5..bb28b178d92950ccd1435ff693d108869c0f037d
--- 1/scripts/checkpatch.pl
--- 2/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@@ -2687,6 -2687,24 +2687,24 @@@ sub process 
                        } else {
                                $signatures{$sig_nospace} = 1;
                        }
+ 
+ # Check Co-developed-by: immediately followed by Signed-off-by: with same name and email
+                       if ($sign_off =~ /^co-developed-by:$/i) {
+                               if ($email eq $author) {
+                                       WARN("BAD_SIGN_OFF",
+                                             "Co-developed-by: should not be used to attribute nominal patch author '$author'\n" . "$here\n" . $rawline);
+                               }
+                               if (!defined $lines[$linenr]) {
+                                       WARN("BAD_SIGN_OFF",
+                                              "Co-developed-by: must be immediately followed by Signed-off-by:\n" . "$here\n" . $rawline);
+                               } elsif ($rawlines[$linenr] !~ /^\s*signed-off-by:\s*(.*)/i) {
+                                       WARN("BAD_SIGN_OFF",
+                                            "Co-developed-by: must be immediately followed by Signed-off-by:\n" . "$here\n" . $rawline . "\n" .$rawlines[$linenr]);
+                               } elsif ($1 ne $email) {
+                                       WARN("BAD_SIGN_OFF",
+                                            "Co-developed-by and Signed-off-by: name/email do not match \n" . "$here\n" . $rawline . "\n" .$rawlines[$linenr]);
+                               }
+                       }
                }
  
  # Check email subject for common tools that don't need to be mentioned
@@@ -5977,7 -5995,7 +5995,7 @@@
                                while ($fmt =~ /(\%[\*\d\.]*p(\w))/g) {
                                        $specifier = $1;
                                        $extension = $2;
 -                                      if ($extension !~ /[SsBKRraEhMmIiUDdgVCbGNOx]/) {
 +                                      if ($extension !~ /[SsBKRraEhMmIiUDdgVCbGNOxt]/) {
                                                $bad_specifier = $specifier;
                                                last;
                                        }