projects / linux-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: b694011 94f2be5)
Merge tag 'printk-for-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/printk...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Jun 2021 19:07:18 +0000 (12:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Jun 2021 19:07:18 +0000 (12:07 -0700)
Pull printk updates from Petr Mladek:

 - Add %pt[RT]s modifier to vsprintf(). It overrides ISO 8601 separator
   by using ' ' (space). It produces "YYYY-mm-dd HH:MM:SS" instead of
   "YYYY-mm-ddTHH:MM:SS".

 - Correctly parse long row of numbers by sscanf() when using the field
   width. Add extensive sscanf() selftest.

 - Generalize re-entrant CPU lock that has already been used to
   serialize dump_stack() output. It is part of the ongoing printk
   rework. It will allow to remove the obsoleted printk_safe buffers and
   introduce atomic consoles.

 - Some code clean up and sparse warning fixes.

* tag 'printk-for-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  printk: fix cpu lock ordering
  lib/dump_stack: move cpu lock to printk.c
  printk: Remove trailing semicolon in macros
  random32: Fix implicit truncation warning in prandom_seed_state()
  lib: test_scanf: Remove pointless use of type_min() with unsigned types
  selftests: lib: Add wrapper script for test_scanf
  lib: test_scanf: Add tests for sscanf number conversion
  lib: vsprintf: Fix handling of number field widths in vsscanf
  lib: vsprintf: scanf: Negative number must have field width > 1
  usb: host: xhci-tegra: Switch to use %ptTs
  nilfs2: Switch to use %ptTs
  kdb: Switch to use %ptTs
  lib/vsprintf: Allow to override ISO 8601 date and time separator

1  2 
Documentation/core-api/printk-formats.rst patch | diff1 | diff2 | blob | history
MAINTAINERS patch | diff1 | diff2 | blob | history
fs/nilfs2/sysfs.c patch | diff1 | diff2 | blob | history
lib/Kconfig.debug patch | diff1 | diff2 | blob | history
lib/Makefile patch | diff1 | diff2 | blob | history
lib/test_printf.c patch | diff1 | diff2 | blob | history
lib/vsprintf.c patch | diff1 | diff2 | blob | history

diff --combined Documentation/core-api/printk-formats.rst
index 385c0cc52f1f5cb44cb47343478ec1f36735f054,7b6bfd8a78d35feee819c34dc8acbef636560ba6..4346ae17a72c356ee640406636cc0db709e8dbf8
--- 1/Documentation/core-api/printk-formats.rst
--- 2/Documentation/core-api/printk-formats.rst
+++ b/Documentation/core-api/printk-formats.rst
@@@ -37,13 -37,14 +37,13 @@@ Integer type
                u64                     %llu or %llx
  
  
 -If <type> is dependent on a config option for its size (e.g., sector_t,
 -blkcnt_t) or is architecture-dependent for its size (e.g., tcflag_t), use a
 -format specifier of its largest possible type and explicitly cast to it.
 +If <type> is architecture-dependent for its size (e.g., cycles_t, tcflag_t) or
 +is dependent on a config option for its size (e.g., blk_status_t), use a format
 +specifier of its largest possible type and explicitly cast to it.
  
  Example::
  
 -      printk("test: sector number/total blocks: %llu/%llu\n",
 -              (unsigned long long)sector, (unsigned long long)blockcount);
 +      printk("test: latency: %llu cycles\n", (unsigned long long)time);
  
  Reminder: sizeof() returns type size_t.
  
@@@ -513,9 -514,10 +513,10 @@@ Time and dat
  ::
  
        %pt[RT]                 YYYY-mm-ddTHH:MM:SS
+       %pt[RT]s                YYYY-mm-dd HH:MM:SS
        %pt[RT]d                YYYY-mm-dd
        %pt[RT]t                HH:MM:SS
-       %pt[RT][dt][r]
+       %pt[RT][dt][r][s]
  
  For printing date and time as represented by::
  
@@@ -527,6 -529,10 +528,10 @@@ in human readable format
  By default year will be incremented by 1900 and month by 1.
  Use %pt[RT]r (raw) to suppress this behaviour.
  
+ The %pt[RT]s (space) will override ISO 8601 separator by using ' ' (space)
+ instead of 'T' (Capital T) between date and time. It won't have any effect
+ when date or time is omitted.
+ 
  Passed by reference.
  
  struct clk
@@@ -590,24 -596,6 +595,24 @@@ For printing netdev_features_t
  
  Passed by reference.
  
 +V4L2 and DRM FourCC code (pixel format)
 +---------------------------------------
 +
 +::
 +
 +      %p4cc
 +
 +Print a FourCC code used by V4L2 or DRM, including format endianness and
 +its numerical value as hexadecimal.
 +
 +Passed by reference.
 +
 +Examples::
 +
 +      %p4cc   BG12 little-endian (0x32314742)
 +      %p4cc   Y10  little-endian (0x20303159)
 +      %p4cc   NV12 big-endian (0xb231564e)
 +
  Thanks
  ======
  
diff --combined MAINTAINERS
index 8ae6ea3b99fc2360348b210ecc34e16ddab0469b,eb05132f8ff1ff0c94320ab8a5b733a58d4d6414..19cb1ea49c246438b61ba6a51ce42d2eb8d77850
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -624,7 -624,6 +624,7 @@@ F: fs/affs
  
  AFS FILESYSTEM
  M:    David Howells <dhowells@redhat.com>
 +M:    Marc Dionne <marc.dionne@auristor.com>
  L:    linux-afs@lists.infradead.org
  S:    Supported
  W:    https://www.infradead.org/~dhowells/kafs/
@@@ -1327,7 -1326,7 +1327,7 @@@ ARC PGU DRM DRIVE
  M:    Alexey Brodkin <abrodkin@synopsys.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/display/snps,arcpgu.txt
 -F:    drivers/gpu/drm/arc/
 +F:    drivers/gpu/drm/tiny/arcpgu.c
  
  ARCNET NETWORK LAYER
  M:    Michael Grzeschik <m.grzeschik@pengutronix.de>
@@@ -1534,7 -1533,6 +1534,7 @@@ F:      Documentation/devicetree/bindings/dm
  F:    Documentation/devicetree/bindings/i2c/i2c-owl.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml
  F:    Documentation/devicetree/bindings/mmc/owl-mmc.yaml
 +F:    Documentation/devicetree/bindings/net/actions,owl-emac.yaml
  F:    Documentation/devicetree/bindings/pinctrl/actions,*
  F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
  F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
@@@ -1547,7 -1545,6 +1547,7 @@@ F:      drivers/dma/owl-dma.
  F:    drivers/i2c/busses/i2c-owl.c
  F:    drivers/irqchip/irq-owl-sirq.c
  F:    drivers/mmc/host/owl-mmc.c
 +F:    drivers/net/ethernet/actions/
  F:    drivers/pinctrl/actions/*
  F:    drivers/soc/actions/
  F:    include/dt-bindings/power/owl-*
@@@ -1578,7 -1575,7 +1578,7 @@@ F:      drivers/clk/sunxi
  ARM/Allwinner sunXi SoC support
  M:    Maxime Ripard <mripard@kernel.org>
  M:    Chen-Yu Tsai <wens@csie.org>
 -R:    Jernej Skrabec <jernej.skrabec@siol.net>
 +R:    Jernej Skrabec <jernej.skrabec@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
@@@ -1618,8 -1615,8 +1618,8 @@@ F:      Documentation/devicetree/bindings/so
  F:    sound/soc/meson/
  
  ARM/Amlogic Meson SoC support
 +M:    Neil Armstrong <narmstrong@baylibre.com>
  M:    Kevin Hilman <khilman@baylibre.com>
 -R:    Neil Armstrong <narmstrong@baylibre.com>
  R:    Jerome Brunet <jbrunet@baylibre.com>
  R:    Martin Blumenstingl <martin.blumenstingl@googlemail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1783,8 -1780,6 +1783,8 @@@ F:      Documentation/ABI/testing/sysfs-bus-
  F:    Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
  F:    Documentation/devicetree/bindings/arm/coresight-cti.yaml
  F:    Documentation/devicetree/bindings/arm/coresight.txt
 +F:    Documentation/devicetree/bindings/arm/ete.yaml
 +F:    Documentation/devicetree/bindings/arm/trbe.yaml
  F:    Documentation/trace/coresight/*
  F:    drivers/hwtracing/coresight/*
  F:    include/dt-bindings/arm/coresight-cti-dt.h
@@@ -1811,13 -1806,12 +1811,13 @@@ F:   Documentation/devicetree/bindings/ne
  F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
  F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
  F:    arch/arm/mach-gemini/
 +F:    drivers/crypto/gemini/
  F:    drivers/net/ethernet/cortina/
  F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
  ARM/CZ.NIC TURRIS SUPPORT
 -M:    Marek Behun <kabel@kernel.org>
 +M:    Marek Behún <kabel@kernel.org>
  S:    Maintained
  W:    https://www.turris.cz/
  F:    Documentation/ABI/testing/debugfs-moxtet
@@@ -1973,7 -1967,6 +1973,7 @@@ F:      Documentation/devicetree/bindings/in
  F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
  F:    arch/arm/mach-ixp4xx/
  F:    drivers/clocksource/timer-ixp4xx.c
 +F:    drivers/crypto/ixp4xx_crypto.c
  F:    drivers/gpio/gpio-ixp4xx.c
  F:    drivers/irqchip/irq-ixp4xx.c
  F:    include/linux/irqchip/irq-ixp4xx.h
@@@ -2763,6 -2756,7 +2763,6 @@@ F:      Documentation/devicetree/bindings/i2
  F:    Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
  F:    Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml
  F:    arch/arm/mach-zynq/
 -F:    drivers/block/xsysace.c
  F:    drivers/clocksource/timer-cadence-ttc.c
  F:    drivers/cpuidle/cpuidle-zynq.c
  F:    drivers/edac/synopsys_edac.c
@@@ -2901,18 -2895,6 +2901,18 @@@ W:    http://www.openaoe.org
  F:    Documentation/admin-guide/aoe/
  F:    drivers/block/aoe/
  
 +ATC260X PMIC MFD DRIVER
 +M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 +M:    Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
 +L:    linux-actions@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mfd/actions,atc260x.yaml
 +F:    drivers/input/misc/atc260x-onkey.c
 +F:    drivers/mfd/atc260*
 +F:    drivers/power/reset/atc260x-poweroff.c
 +F:    drivers/regulator/atc260x-regulator.c
 +F:    include/linux/mfd/atc260x/*
 +
  ATHEROS 71XX/9XXX GPIO DRIVER
  M:    Alban Bedel <albeu@free.fr>
  S:    Maintained
@@@ -3210,22 -3192,6 +3210,22 @@@ F:    Documentation/filesystems/bfs.rs
  F:    fs/bfs/
  F:    include/uapi/linux/bfs_fs.h
  
 +BITMAP API
 +M:    Yury Norov <yury.norov@gmail.com>
 +R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +R:    Rasmus Villemoes <linux@rasmusvillemoes.dk>
 +S:    Maintained
 +F:    include/asm-generic/bitops/find.h
 +F:    include/linux/bitmap.h
 +F:    lib/bitmap.c
 +F:    lib/find_bit.c
 +F:    lib/find_bit_benchmark.c
 +F:    lib/test_bitmap.c
 +F:    tools/include/asm-generic/bitops/find.h
 +F:    tools/include/linux/bitmap.h
 +F:    tools/lib/bitmap.c
 +F:    tools/lib/find_bit.c
 +
  BLINKM RGB LED DRIVER
  M:    Jan-Simon Moeller <jansimon.moeller@gmx.de>
  S:    Maintained
@@@ -3308,7 -3274,6 +3308,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
  F:    Documentation/bpf/
  F:    Documentation/networking/filter.rst
 +F:    Documentation/userspace-api/ebpf/
  F:    arch/*/net/*
  F:    include/linux/bpf*
  F:    include/linux/filter.h
@@@ -3323,7 -3288,6 +3323,7 @@@ F:      net/core/filter.
  F:    net/sched/act_bpf.c
  F:    net/sched/cls_bpf.c
  F:    samples/bpf/
 +F:    scripts/bpf_doc.py
  F:    tools/bpf/
  F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
@@@ -3879,7 -3843,6 +3879,7 @@@ L:      linux-btrfs@vger.kernel.or
  S:    Maintained
  W:    http://btrfs.wiki.kernel.org/
  Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
 +C:    irc://irc.libera.chat/btrfs
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git
  F:    Documentation/filesystems/btrfs.rst
  F:    fs/btrfs/
@@@ -4141,14 -4104,6 +4141,14 @@@ S:    Odd Fixe
  F:    Documentation/devicetree/bindings/arm/cavium-thunder2.txt
  F:    arch/arm64/boot/dts/cavium/thunder2-99xx*
  
 +CBS/ETF/TAPRIO QDISCS
 +M:    Vinicius Costa Gomes <vinicius.gomes@intel.com>
 +S:    Maintained
 +L:    netdev@vger.kernel.org
 +F:    net/sched/sch_cbs.c
 +F:    net/sched/sch_etf.c
 +F:    net/sched/sch_taprio.c
 +
  CC2520 IEEE-802.15.4 RADIO DRIVER
  M:    Varka Bhadram <varkabhadram@gmail.com>
  L:    linux-wpan@vger.kernel.org
@@@ -4612,12 -4567,6 +4612,12 @@@ S:    Supporte
  F:    drivers/video/console/
  F:    include/linux/console*
  
 +CONTEXT TRACKING
 +M:    Frederic Weisbecker <frederic@kernel.org>
 +S:    Maintained
 +F:    kernel/context_tracking.c
 +F:    include/linux/context_tracking*
 +
  CONTROL GROUP (CGROUP)
  M:    Tejun Heo <tj@kernel.org>
  M:    Zefan Li <lizefan.x@bytedance.com>
@@@ -4698,11 -4647,6 +4698,11 @@@ F:    drivers/counter
  F:    include/linux/counter.h
  F:    include/linux/counter_enum.h
  
 +CP2615 I2C DRIVER
 +M:    Bence Csókás <bence98@sch.bme.hu>
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-cp2615.c
 +
  CPMAC ETHERNET DRIVER
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    netdev@vger.kernel.org
@@@ -5106,7 -5050,7 +5106,7 @@@ S:      Maintaine
  F:    drivers/net/fddi/defza.*
  
  DEINTERLACE DRIVERS FOR ALLWINNER H3
 -M:    Jernej Skrabec <jernej.skrabec@siol.net>
 +M:    Jernej Skrabec <jernej.skrabec@gmail.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -5197,13 -5141,6 +5197,13 @@@ W:    https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/platform/sti/delta
  
 +DELTA DPS920AB PSU DRIVER
 +M:    Robert Marko <robert.marko@sartura.hr>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/hwmon/dps920ab.rst
 +F:    drivers/hwmon/pmbus/dps920ab.c
 +
  DENALI NAND DRIVER
  L:    linux-mtd@lists.infradead.org
  S:    Orphan
@@@ -5261,7 -5198,7 +5261,7 @@@ DEVICE DIRECT ACCESS (DAX
  M:    Dan Williams <dan.j.williams@intel.com>
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
 -L:    linux-nvdimm@lists.01.org
 +L:    nvdimm@lists.linux.dev
  S:    Supported
  F:    drivers/dax/
  
@@@ -5593,6 -5530,7 +5593,6 @@@ F:      drivers/soc/fsl/dpi
  
  DPAA2 ETHERNET DRIVER
  M:    Ioana Ciornei <ioana.ciornei@nxp.com>
 -M:    Ioana Radulescu <ruxandra.radulescu@nxp.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    Documentation/networking/device_drivers/ethernet/freescale/dpaa2/ethernet-driver.rst
@@@ -5606,11 -5544,11 +5606,11 @@@ F:   drivers/net/ethernet/freescale/dpaa2
  F:    drivers/net/ethernet/freescale/dpaa2/dpni*
  
  DPAA2 ETHERNET SWITCH DRIVER
 -M:    Ioana Radulescu <ruxandra.radulescu@nxp.com>
  M:    Ioana Ciornei <ioana.ciornei@nxp.com>
 -L:    linux-kernel@vger.kernel.org
 +L:    netdev@vger.kernel.org
  S:    Maintained
 -F:    drivers/staging/fsl-dpaa2/ethsw
 +F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
 +F:    drivers/net/ethernet/freescale/dpaa2/dpsw*
  
  DPT_I2O SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <aacraid@microsemi.com>
@@@ -5655,14 -5593,14 +5655,14 @@@ F:   include/linux/power/smartreflex.
  DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE
  M:    Maxime Ripard <mripard@kernel.org>
  M:    Chen-Yu Tsai <wens@csie.org>
 -R:    Jernej Skrabec <jernej.skrabec@siol.net>
 +R:    Jernej Skrabec <jernej.skrabec@gmail.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/sun4i/sun8i*
  
  DRM DRIVER FOR ARM PL111 CLCD
 -M:    Eric Anholt <eric@anholt.net>
 +M:    Emma Anholt <emma@anholt.net>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/pl111/
@@@ -5703,12 -5641,6 +5703,12 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/display/panel/boe,himax8279d.yaml
  F:    drivers/gpu/drm/panel/panel-boe-himax8279d.c
  
 +DRM DRIVER FOR CHIPONE ICN6211 MIPI-DSI to RGB CONVERTER BRIDGE
 +M:    Jagan Teki <jagan@amarulasolutions.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
 +F:    drivers/gpu/drm/bridge/chipone-icn6211.c
 +
  DRM DRIVER FOR FARADAY TVE200 TV ENCODER
  M:    Linus Walleij <linus.walleij@linaro.org>
  S:    Maintained
@@@ -5727,14 -5659,6 +5727,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
  F:    drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
  
 +DRM DRIVER FOR GENERIC USB DISPLAY
 +M:    Noralf Trønnes <noralf@tronnes.org>
 +S:    Maintained
 +W:    https://github.com/notro/gud/wiki
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/gud/
 +F:    include/drm/gud.h
 +
  DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS
  M:    Hans de Goede <hdegoede@redhat.com>
  S:    Maintained
@@@ -5742,7 -5666,7 +5742,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/tiny/gm12u320.c
  
  DRM DRIVER FOR HX8357D PANELS
 -M:    Eric Anholt <eric@anholt.net>
 +M:    Emma Anholt <emma@anholt.net>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/himax,hx8357d.txt
@@@ -5928,7 -5852,7 +5928,7 @@@ DRM DRIVER FOR ST-ERICSSON MCD
  M:    Linus Walleij <linus.walleij@linaro.org>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/ste,mcde.txt
 +F:    Documentation/devicetree/bindings/display/ste,mcde.yaml
  F:    drivers/gpu/drm/mcde/
  
  DRM DRIVER FOR TDFX VIDEO CARDS
@@@ -6043,10 -5967,9 +6043,10 @@@ F:    drivers/gpu/drm/atmel-hlcdc
  DRM DRIVERS FOR BRIDGE CHIPS
  M:    Andrzej Hajda <a.hajda@samsung.com>
  M:    Neil Armstrong <narmstrong@baylibre.com>
 +M:    Robert Foss <robert.foss@linaro.org>
  R:    Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
  R:    Jonas Karlman <jonas@kwiboo.se>
 -R:    Jernej Skrabec <jernej.skrabec@siol.net>
 +R:    Jernej Skrabec <jernej.skrabec@gmail.com>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/bridge/
@@@ -6113,7 -6036,6 +6113,7 @@@ DRM DRIVERS FOR MEDIATE
  M:    Chun-Kuang Hu <chunkuang.hu@kernel.org>
  M:    Philipp Zabel <p.zabel@pengutronix.de>
  L:    dri-devel@lists.freedesktop.org
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/display/mediatek/
  F:    drivers/gpu/drm/mediatek/
@@@ -6139,9 -6061,9 +6139,9 @@@ L:      dri-devel@lists.freedesktop.or
  L:    linux-renesas-soc@vger.kernel.org
  S:    Supported
  T:    git git://linuxtv.org/pinchartl/media drm/du/next
 -F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
 +F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml
  F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
 -F:    Documentation/devicetree/bindings/display/renesas,du.txt
 +F:    Documentation/devicetree/bindings/display/renesas,du.yaml
  F:    drivers/gpu/drm/rcar-du/
  F:    drivers/gpu/drm/shmobile/
  F:    include/linux/platform_data/shmob_drm.h
@@@ -6200,15 -6122,15 +6200,15 @@@ F:   Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/omapdrm/
  
  DRM DRIVERS FOR V3D
 -M:    Eric Anholt <eric@anholt.net>
 +M:    Emma Anholt <emma@anholt.net>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt
 +F:    Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml
  F:    drivers/gpu/drm/v3d/
  F:    include/uapi/drm/v3d_drm.h
  
  DRM DRIVERS FOR VC4
 -M:    Eric Anholt <eric@anholt.net>
 +M:    Emma Anholt <emma@anholt.net>
  M:    Maxime Ripard <mripard@kernel.org>
  S:    Supported
  T:    git git://github.com/anholt/linux
@@@ -6786,7 -6708,7 +6786,7 @@@ F:      include/video/s1d13xxxfb.
  
  EROFS FILE SYSTEM
  M:    Gao Xiang <xiang@kernel.org>
 -M:    Chao Yu <yuchao0@huawei.com>
 +M:    Chao Yu <chao@kernel.org>
  L:    linux-erofs@lists.ozlabs.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
@@@ -6961,7 -6883,6 +6961,7 @@@ F:      net/core/failover.
  FANOTIFY
  M:    Jan Kara <jack@suse.cz>
  R:    Amir Goldstein <amir73il@gmail.com>
 +R:    Matthew Bobrowski <repnop@google.com>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    fs/notify/fanotify/
@@@ -7030,7 -6951,7 +7030,7 @@@ M:      Dan Williams <dan.j.williams@intel.c
  R:    Matthew Wilcox <willy@infradead.org>
  R:    Jan Kara <jack@suse.cz>
  L:    linux-fsdevel@vger.kernel.org
 -L:    linux-nvdimm@lists.01.org
 +L:    nvdimm@lists.linux.dev
  S:    Supported
  F:    fs/dax.c
  F:    include/linux/dax.h
@@@ -7181,7 -7102,7 +7181,7 @@@ F:      include/video
  
  FREESCALE CAAM (Cryptographic Acceleration and Assurance Module) DRIVER
  M:    Horia Geantă <horia.geanta@nxp.com>
 -M:    Aymen Sghaier <aymen.sghaier@nxp.com>
 +M:    Pankaj Gupta <pankaj.gupta@nxp.com>
  L:    linux-crypto@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@@ -7283,13 -7204,6 +7283,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
  F:    drivers/i2c/busses/i2c-imx-lpi2c.c
  
 +FREESCALE MPC I2C DRIVER
 +M:    Chris Packham <chris.packham@alliedtelesis.co.nz>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-mpc.yaml
 +F:    drivers/i2c/busses/i2c-mpc.c
 +
  FREESCALE QORIQ DPAA ETHERNET DRIVER
  M:    Madalin Bucur <madalin.bucur@nxp.com>
  L:    netdev@vger.kernel.org
@@@ -7355,7 -7269,7 +7355,7 @@@ M:      Li Yang <leoyang.li@nxp.com
  L:    linuxppc-dev@lists.ozlabs.org
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt
 +F:    Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml
  F:    Documentation/devicetree/bindings/soc/fsl/
  F:    drivers/soc/fsl/
  F:    include/linux/fsl/
@@@ -7369,6 -7283,7 +7369,6 @@@ F:      drivers/net/ethernet/freescale/fs_en
  F:    include/linux/fs_enet_pd.h
  
  FREESCALE SOC SOUND DRIVERS
 -M:    Timur Tabi <timur@kernel.org>
  M:    Nicolin Chen <nicoleotsuka@gmail.com>
  M:    Xiubo Li <Xiubo.Lee@gmail.com>
  R:    Fabio Estevam <festevam@gmail.com>
@@@ -7486,13 -7401,6 +7486,13 @@@ F:    fs/verity
  F:    include/linux/fsverity.h
  F:    include/uapi/linux/fsverity.h
  
 +FT260 FTDI USB-HID TO I2C BRIDGE DRIVER
 +M:    Michael Zaidman <michael.zaidman@gmail.com>
 +L:    linux-i2c@vger.kernel.org
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hid/hid-ft260.c
 +
  FUJITSU LAPTOP EXTRAS
  M:    Jonathan Woithe <jwoithe@just42.net>
  L:    platform-driver-x86@vger.kernel.org
@@@ -7528,7 -7436,6 +7528,7 @@@ M:      Thomas Gleixner <tglx@linutronix.de
  M:    Ingo Molnar <mingo@redhat.com>
  R:    Peter Zijlstra <peterz@infradead.org>
  R:    Darren Hart <dvhart@infradead.org>
 +R:    Davidlohr Bueso <dave@stgolabs.net>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@@ -7571,12 -7478,6 +7571,12 @@@ M:    Kieran Bingham <kbingham@kernel.org
  S:    Supported
  F:    scripts/gdb/
  
 +GEMINI CRYPTO DRIVER
 +M:    Corentin Labbe <clabbe@baylibre.com>
 +L:    linux-crypto@vger.kernel.org
 +S:    Maintained
 +F:    drivers/crypto/gemini/
 +
  GEMTEK FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -8217,13 -8118,6 +8217,13 @@@ F:    drivers/crypto/hisilicon/hpre/hpre.
  F:    drivers/crypto/hisilicon/hpre/hpre_crypto.c
  F:    drivers/crypto/hisilicon/hpre/hpre_main.c
  
 +HISILICON I2C CONTROLLER DRIVER
 +M:    Yicong Yang <yangyicong@hisilicon.com>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +W:    https://www.hisilicon.com
 +F:    drivers/i2c/busses/i2c-hisi.c
 +
  HISILICON LPC BUS DRIVER
  M:    john.garry@huawei.com
  S:    Maintained
@@@ -8274,6 -8168,7 +8274,6 @@@ F:      drivers/crypto/hisilicon/zip
  
  HISILICON ROCE DRIVER
  M:    Lijun Ou <oulijun@huawei.com>
 -M:    Wei Hu(Xavier) <huwei87@hisilicon.com>
  M:    Weihang Li <liweihang@huawei.com>
  L:    linux-rdma@vger.kernel.org
  S:    Maintained
@@@ -8434,13 -8329,6 +8434,13 @@@ S:    Maintaine
  F:    mm/hwpoison-inject.c
  F:    mm/memory-failure.c
  
 +HYCON HY46XX TOUCHSCREEN SUPPORT
 +M:    Giulio Benetti <giulio.benetti@benettiengineering.com>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/input/touchscreen/hycon,hy46xx.yaml
 +F:    drivers/input/touchscreen/hycon-hy46xx.c
 +
  HYGON PROCESSOR SUPPORT
  M:    Pu Wen <puwen@hygon.cn>
  L:    linux-kernel@vger.kernel.org
@@@ -8454,12 -8342,11 +8454,12 @@@ S:   Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/hi556.c
  
 -Hyper-V CORE AND DRIVERS
 +Hyper-V/Azure CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <kys@microsoft.com>
  M:    Haiyang Zhang <haiyangz@microsoft.com>
  M:    Stephen Hemminger <sthemmin@microsoft.com>
  M:    Wei Liu <wei.liu@kernel.org>
 +M:    Dexuan Cui <decui@microsoft.com>
  L:    linux-hyperv@vger.kernel.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
@@@ -8476,7 -8363,6 +8476,7 @@@ F:      drivers/hid/hid-hyperv.
  F:    drivers/hv/
  F:    drivers/input/serio/hyperv-keyboard.c
  F:    drivers/iommu/hyperv-iommu.c
 +F:    drivers/net/ethernet/microsoft/
  F:    drivers/net/hyperv/
  F:    drivers/pci/controller/pci-hyperv-intf.c
  F:    drivers/pci/controller/pci-hyperv.c
@@@ -8719,6 -8605,7 +8719,6 @@@ IBM Power SRIOV Virtual NIC Device Driv
  M:    Dany Madden <drt@linux.ibm.com>
  M:    Sukadev Bhattiprolu <sukadev@linux.ibm.com>
  R:    Thomas Falcon <tlfalcon@linux.ibm.com>
 -R:    Lijun Pan <lijunp213@gmail.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmvnic.*
@@@ -8792,6 -8679,22 +8792,6 @@@ L:     linux-i2c@vger.kernel.or
  S:    Maintained
  F:    drivers/i2c/busses/i2c-icy.c
  
 -IDE SUBSYSTEM
 -M:    "David S. Miller" <davem@davemloft.net>
 -L:    linux-ide@vger.kernel.org
 -S:    Maintained
 -Q:    http://patchwork.ozlabs.org/project/linux-ide/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git
 -F:    Documentation/ide/
 -F:    drivers/ide/
 -F:    include/linux/ide.h
 -
 -IDE/ATAPI DRIVERS
 -L:    linux-ide@vger.kernel.org
 -S:    Orphan
 -F:    Documentation/cdrom/ide-cd.rst
 -F:    drivers/ide/ide-cd*
 -
  IDEAPAD LAPTOP EXTRAS DRIVER
  M:    Ike Panhc <ike.pan@canonical.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -9248,12 -9151,6 +9248,12 @@@ F:    Documentation/admin-guide/media/ipu3
  F:    Documentation/userspace-api/media/v4l/pixfmt-meta-intel-ipu3.rst
  F:    drivers/staging/media/ipu3/
  
 +INTEL IXP4XX CRYPTO SUPPORT
 +M:    Corentin Labbe <clabbe@baylibre.com>
 +L:    linux-crypto@vger.kernel.org
 +S:    Maintained
 +F:    drivers/crypto/ixp4xx_crypto.c
 +
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
  M:    Krzysztof Halasa <khalasa@piap.pl>
  S:    Maintained
@@@ -9308,26 -9205,6 +9308,26 @@@ F:    include/linux/mei_cl_bus.
  F:    include/uapi/linux/mei.h
  F:    samples/mei/*
  
 +INTEL MAX 10 BMC MFD DRIVER
 +M:    Xu Yilun <yilun.xu@intel.com>
 +R:    Tom Rix <trix@redhat.com>
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc
 +F:    Documentation/hwmon/intel-m10-bmc-hwmon.rst
 +F:    drivers/hwmon/intel-m10-bmc-hwmon.c
 +F:    drivers/mfd/intel-m10-bmc.c
 +F:    include/linux/mfd/intel-m10-bmc.h
 +
 +INTEL MAX 10 BMC MFD DRIVER
 +M:    Xu Yilun <yilun.xu@intel.com>
 +R:    Tom Rix <trix@redhat.com>
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc
 +F:    Documentation/hwmon/intel-m10-bmc-hwmon.rst
 +F:    drivers/hwmon/intel-m10-bmc-hwmon.c
 +F:    drivers/mfd/intel-m10-bmc.c
 +F:    include/linux/mfd/intel-m10-bmc.h
 +
  INTEL MENLOW THERMAL DRIVER
  M:    Sujith Thomas <sujith.thomas@intel.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -9525,7 -9402,7 +9525,7 @@@ INVENSENSE MPU-3050 GYROSCOPE DRIVE
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt
 +F:    Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.yaml
  F:    drivers/iio/gyro/mpu3050*
  
  IOC3 ETHERNET DRIVER
@@@ -9572,7 -9449,6 +9572,7 @@@ F:      fs/io-wq.
  F:    fs/io_uring.c
  F:    include/linux/io_uring.h
  F:    include/uapi/linux/io_uring.h
 +F:    tools/io_uring/
  
  IPMI SUBSYSTEM
  M:    Corey Minyard <minyard@acm.org>
@@@ -9915,7 -9791,6 +9915,7 @@@ F:      scripts/*vmlinux
  F:    scripts/Kbuild*
  F:    scripts/Makefile*
  F:    scripts/basic/
 +F:    scripts/dummy-tools/
  F:    scripts/mk*
  F:    scripts/mod/
  F:    scripts/package/
@@@ -9995,18 -9870,16 +9995,18 @@@ F:   virt/kvm/
  KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
  M:    Marc Zyngier <maz@kernel.org>
  R:    James Morse <james.morse@arm.com>
 -R:    Julien Thierry <julien.thierry.kdev@gmail.com>
 +R:    Alexandru Elisei <alexandru.elisei@arm.com>
  R:    Suzuki K Poulose <suzuki.poulose@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -L:    kvmarm@lists.cs.columbia.edu
 +L:    kvmarm@lists.cs.columbia.edu (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
  F:    arch/arm64/include/asm/kvm*
  F:    arch/arm64/include/uapi/asm/kvm*
  F:    arch/arm64/kvm/
  F:    include/kvm/arm_*
 +F:    tools/testing/selftests/kvm/*/aarch64/
 +F:    tools/testing/selftests/kvm/aarch64/
  
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
  M:    Huacai Chen <chenhuacai@kernel.org>
@@@ -10216,12 -10089,6 +10216,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/leds/backlight/kinetic,ktd253.yaml
  F:    drivers/video/backlight/ktd253-backlight.c
  
 +KTEST
 +M:    Steven Rostedt <rostedt@goodmis.org>
 +M:    John Hawley <warthog9@eaglescrag.net>
 +S:    Maintained
 +F:    tools/testing/ktest
 +
  L3MDEV
  M:    David Ahern <dsahern@kernel.org>
  L:    netdev@vger.kernel.org
@@@ -10243,21 -10110,6 +10243,21 @@@ F: net/core/sock_map.
  F:    net/ipv4/tcp_bpf.c
  F:    net/ipv4/udp_bpf.c
  
 +LANDLOCK SECURITY MODULE
 +M:    Mickaël Salaün <mic@digikod.net>
 +L:    linux-security-module@vger.kernel.org
 +S:    Supported
 +W:    https://landlock.io
 +T:    git https://github.com/landlock-lsm/linux.git
 +F:    Documentation/security/landlock.rst
 +F:    Documentation/userspace-api/landlock.rst
 +F:    include/uapi/linux/landlock.h
 +F:    samples/landlock/
 +F:    security/landlock/
 +F:    tools/testing/selftests/landlock/
 +K:    landlock
 +K:    LANDLOCK
 +
  LANTIQ / INTEL Ethernet drivers
  M:    Hauke Mehrtens <hauke@hauke-m.de>
  L:    netdev@vger.kernel.org
@@@ -10307,7 -10159,7 +10307,7 @@@ F:   drivers/misc/eeprom/eeprom.
  LEGO MINDSTORMS EV3
  R:    David Lechner <david@lechnology.com>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/power/supply/lego_ev3_battery.txt
 +F:    Documentation/devicetree/bindings/power/supply/lego,ev3-battery.yaml
  F:    arch/arm/boot/dts/da850-lego-ev3.dts
  F:    drivers/power/supply/lego_ev3_battery.c
  
@@@ -10399,7 -10251,7 +10399,7 @@@ LIBNVDIMM BLK: MMIO-APERTURE DRIVE
  M:    Dan Williams <dan.j.williams@intel.com>
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
 -L:    linux-nvdimm@lists.01.org
 +L:    nvdimm@lists.linux.dev
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  P:    Documentation/nvdimm/maintainer-entry-profile.rst
@@@ -10410,7 -10262,7 +10410,7 @@@ LIBNVDIMM BTT: BLOCK TRANSLATION TABL
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Dan Williams <dan.j.williams@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
 -L:    linux-nvdimm@lists.01.org
 +L:    nvdimm@lists.linux.dev
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  P:    Documentation/nvdimm/maintainer-entry-profile.rst
@@@ -10420,7 -10272,7 +10420,7 @@@ LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVE
  M:    Dan Williams <dan.j.williams@intel.com>
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
 -L:    linux-nvdimm@lists.01.org
 +L:    nvdimm@lists.linux.dev
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  P:    Documentation/nvdimm/maintainer-entry-profile.rst
@@@ -10428,7 -10280,7 +10428,7 @@@ F:   drivers/nvdimm/pmem
  
  LIBNVDIMM: DEVICETREE BINDINGS
  M:    Oliver O'Halloran <oohall@gmail.com>
 -L:    linux-nvdimm@lists.01.org
 +L:    nvdimm@lists.linux.dev
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  F:    Documentation/devicetree/bindings/pmem/pmem-region.txt
@@@ -10439,7 -10291,7 +10439,7 @@@ M:   Dan Williams <dan.j.williams@intel.c
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
  M:    Ira Weiny <ira.weiny@intel.com>
 -L:    linux-nvdimm@lists.01.org
 +L:    nvdimm@lists.linux.dev
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  P:    Documentation/nvdimm/maintainer-entry-profile.rst
@@@ -10720,12 -10572,6 +10720,12 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
  F:    drivers/hid/hid-lg-g15.c
  
 +LONTIUM LT8912B MIPI TO HDMI BRIDGE
 +M:    Adrien Grassein <adrien.grassein@gmail.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
 +F:    drivers/gpu/drm/bridge/lontium-lt8912b.c
 +
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Sathya Prakash <sathya.prakash@broadcom.com>
  M:    Sreekanth Reddy <sreekanth.reddy@broadcom.com>
@@@ -10872,7 -10718,6 +10872,7 @@@ S:   Maintaine
  F:    drivers/mailbox/
  F:    include/linux/mailbox_client.h
  F:    include/linux/mailbox_controller.h
 +F:    Documentation/devicetree/bindings/mailbox/
  
  MAILBOX ARM MHUv2
  M:    Viresh Kumar <viresh.kumar@linaro.org>
@@@ -10958,7 -10803,6 +10958,7 @@@ F:   include/linux/mv643xx.
  
  MARVELL MV88X3310 PHY DRIVER
  M:    Russell King <linux@armlinux.org.uk>
 +M:    Marek Behún <kabel@kernel.org>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/phy/marvell10g.c
@@@ -11181,7 -11025,7 +11181,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/radio/radio-maxiradio*
  
  MCAN MMIO DEVICE DRIVER
 -M:    Pankaj Sharma <pankj.sharma@samsung.com>
 +M:    Chandrasekar Ramakrishnan <rcsekar@samsung.com>
  L:    linux-can@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
@@@ -11304,7 -11148,6 +11304,7 @@@ F:   include/media/imx.
  
  MEDIA DRIVERS FOR FREESCALE IMX7
  M:    Rui Miguel Silva <rmfrfs@gmail.com>
 +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -11380,12 -11223,12 +11380,12 @@@ F:        drivers/media/platform/renesas-ceu.
  F:    include/media/drv-intf/renesas-ceu.h
  
  MEDIA DRIVERS FOR RENESAS - DRIF
 -M:    Ramesh Shanmugasundaram <rashanmu@gmail.com>
 +M:    Fabrizio Castro <fabrizio.castro.jz@renesas.com>
  L:    linux-media@vger.kernel.org
  L:    linux-renesas-soc@vger.kernel.org
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/renesas,drif.txt
 +F:    Documentation/devicetree/bindings/media/renesas,drif.yaml
  F:    drivers/media/platform/rcar_drif.c
  
  MEDIA DRIVERS FOR RENESAS - FCP
@@@ -11414,7 -11257,6 +11414,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/renesas,csi2.yaml
 +F:    Documentation/devicetree/bindings/media/renesas,isp.yaml
  F:    Documentation/devicetree/bindings/media/renesas,vin.yaml
  F:    drivers/media/platform/rcar-vin/
  
@@@ -11555,7 -11397,7 +11555,7 @@@ F:   drivers/media/platform/mtk-vpu
  MEDIATEK MMC/SD/SDIO DRIVER
  M:    Chaotian Jing <chaotian.jing@mediatek.com>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/mmc/mtk-sd.txt
 +F:    Documentation/devicetree/bindings/mmc/mtk-sd.yaml
  F:    drivers/mmc/host/mtk-sd.c
  
  MEDIATEK MT76 WIRELESS LAN DRIVER
@@@ -11572,12 -11414,6 +11572,12 @@@ L: linux-wireless@vger.kernel.or
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
 +MEDIATEK MT7621 CLOCK DRIVER
 +M:    Sergio Paracuellos <sergio.paracuellos@gmail.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/clock/mediatek,mt7621-sysc.yaml
 +F:    drivers/clk/ralink/clk-mt7621.c
 +
  MEDIATEK MT7621/28/88 I2C DRIVER
  M:    Stefan Roese <sr@denx.de>
  L:    linux-i2c@vger.kernel.org
@@@ -11840,7 -11676,6 +11840,7 @@@ F:   include/linux/gfp.
  F:    include/linux/memory_hotplug.h
  F:    include/linux/mm.h
  F:    include/linux/mmzone.h
 +F:    include/linux/pagewalk.h
  F:    include/linux/vmalloc.h
  F:    mm/
  
@@@ -12004,13 -11839,11 +12004,13 @@@ MICROCHIP ISC DRIVE
  M:    Eugen Hristev <eugen.hristev@microchip.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/atmel-isc.txt
 +F:    Documentation/devicetree/bindings/media/atmel,isc.yaml
 +F:    Documentation/devicetree/bindings/media/microchip,xisc.yaml
  F:    drivers/media/platform/atmel/atmel-isc-base.c
  F:    drivers/media/platform/atmel/atmel-isc-regs.h
  F:    drivers/media/platform/atmel/atmel-isc.h
  F:    drivers/media/platform/atmel/atmel-sama5d2-isc.c
 +F:    drivers/media/platform/atmel/atmel-sama7g5-isc.c
  F:    include/linux/atmel-isc-media.h
  
  MICROCHIP ISI DRIVER
@@@ -12147,14 -11980,6 +12147,14 @@@ F: drivers/scsi/smartpqi/smartpqi*.[ch
  F:    include/linux/cciss*.h
  F:    include/uapi/linux/cciss*.h
  
 +MICROSOFT SURFACE BATTERY AND AC DRIVERS
 +M:    Maximilian Luz <luzmaximilian@gmail.com>
 +L:    linux-pm@vger.kernel.org
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/power/supply/surface_battery.c
 +F:    drivers/power/supply/surface_charger.c
 +
  MICROSOFT SURFACE DTX DRIVER
  M:    Maximilian Luz <luzmaximilian@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -12178,13 -12003,6 +12178,13 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/surface/
  
 +MICROSOFT SURFACE HID TRANSPORT DRIVER
 +M:    Maximilian Luz <luzmaximilian@gmail.com>
 +L:    linux-input@vger.kernel.org
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hid/surface-hid/
 +
  MICROSOFT SURFACE HOT-PLUG DRIVER
  M:    Maximilian Luz <luzmaximilian@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -12205,7 -12023,6 +12205,7 @@@ F:   drivers/platform/surface/surfacepro3
  
  MICROSOFT SURFACE SYSTEM AGGREGATOR SUBSYSTEM
  M:    Maximilian Luz <luzmaximilian@gmail.com>
 +L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  W:    https://github.com/linux-surface/surface-aggregator-module
  C:    irc://chat.freenode.net/##linux-surface
@@@ -12577,7 -12394,7 +12577,7 @@@ M:   Stefan Agner <stefan@agner.ch
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/mxsfb.txt
 +F:    Documentation/devicetree/bindings/display/fsl,lcdif.yaml
  F:    drivers/gpu/drm/mxsfb/
  
  MYLEX DAC960 PCI RAID Controller
@@@ -12618,7 -12435,7 +12618,7 @@@ S:   Orpha
  F:    drivers/net/ethernet/natsemi/natsemi.c
  
  NCR 5380 SCSI DRIVERS
 -M:    Finn Thain <fthain@telegraphics.com.au>
 +M:    Finn Thain <fthain@linux-m68k.org>
  M:    Michael Schmitz <schmitzmic@gmail.com>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
@@@ -12696,19 -12513,10 +12696,19 @@@ F:        include/net/netrom.
  F:    include/uapi/linux/netrom.h
  F:    net/netrom/
  
 +NETRONIX EMBEDDED CONTROLLER
 +M:    Jonathan Neuschäfer <j.neuschaefer@gmx.net>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mfd/netronix,ntxec.yaml
 +F:    drivers/mfd/ntxec.c
 +F:    drivers/pwm/pwm-ntxec.c
 +F:    drivers/rtc/rtc-ntxec.c
 +F:    include/linux/mfd/ntxec.h
 +
  NETRONOME ETHERNET DRIVERS
 -M:    Simon Horman <simon.horman@netronome.com>
 +M:    Simon Horman <simon.horman@corigine.com>
  R:    Jakub Kicinski <kuba@kernel.org>
 -L:    oss-drivers@netronome.com
 +L:    oss-drivers@corigine.com
  S:    Maintained
  F:    drivers/net/ethernet/netronome/
  
@@@ -12735,6 -12543,7 +12735,6 @@@ M:   "David S. Miller" <davem@davemloft.n
  M:    Jakub Kicinski <kuba@kernel.org>
  L:    netdev@vger.kernel.org
  S:    Maintained
 -W:    http://www.linuxfoundation.org/en/Net
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
@@@ -12779,6 -12588,7 +12779,6 @@@ M:   "David S. Miller" <davem@davemloft.n
  M:    Jakub Kicinski <kuba@kernel.org>
  L:    netdev@vger.kernel.org
  S:    Maintained
 -W:    http://www.linuxfoundation.org/en/Net
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  B:    mailto:netdev@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
@@@ -12861,7 -12671,6 +12861,7 @@@ W:   https://github.com/multipath-tcp/mpt
  B:    https://github.com/multipath-tcp/mptcp_net-next/issues
  F:    Documentation/networking/mptcp-sysctl.rst
  F:    include/net/mptcp.h
 +F:    include/trace/events/mptcp.h
  F:    include/uapi/linux/mptcp.h
  F:    net/mptcp/
  F:    tools/testing/selftests/net/mptcp/
@@@ -12920,10 -12729,8 +12920,10 @@@ F: include/uapi/linux/nexthop.
  F:    net/ipv4/nexthop.c
  
  NFC SUBSYSTEM
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +L:    linux-nfc@lists.01.org (subscribers-only)
  L:    netdev@vger.kernel.org
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/devicetree/bindings/net/nfc/
  F:    drivers/nfc/
  F:    include/linux/platform_data/nfcmrvl.h
@@@ -12934,7 -12741,7 +12934,7 @@@ F:   net/nfc
  NFC VIRTUAL NCI DEVICE DRIVER
  M:    Bongsu Jeon <bongsu.jeon@samsung.com>
  L:    netdev@vger.kernel.org
 -L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 +L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Supported
  F:    drivers/nfc/virtual_ncidev.c
  F:    tools/testing/selftests/nci/
@@@ -13090,7 -12897,7 +13090,7 @@@ F:   Documentation/filesystems/ntfs.rs
  F:    fs/ntfs/
  
  NUBUS SUBSYSTEM
 -M:    Finn Thain <fthain@telegraphics.com.au>
 +M:    Finn Thain <fthain@linux-m68k.org>
  L:    linux-m68k@lists.linux-m68k.org
  S:    Maintained
  F:    arch/*/include/asm/nubus.h
@@@ -13148,12 -12955,6 +13148,12 @@@ F: drivers/nvmem
  F:    include/linux/nvmem-consumer.h
  F:    include/linux/nvmem-provider.h
  
 +NXP C45 TJA11XX PHY DRIVER
 +M:    Radu Pirea <radu-nicolae.pirea@oss.nxp.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/phy/nxp-c45-tja11xx.c
 +
  NXP FSPI DRIVER
  M:    Ashish Kumar <ashish.kumar@nxp.com>
  R:    Yogesh Gaur <yogeshgaur.83@gmail.com>
@@@ -13231,19 -13032,12 +13231,19 @@@ F:        Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/tfa9879*
  
  NXP-NCI NFC DRIVER
 -M:    Clément Perrochaud <clement.perrochaud@effinnov.com>
  R:    Charles Gorand <charles.gorand@effinnov.com>
 -L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 +L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Supported
  F:    drivers/nfc/nxp-nci
  
 +NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
 +M:    Mirela Rabulea <mirela.rabulea@nxp.com>
 +R:    NXP Linux Team <linux-imx@nxp.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/imx8-jpeg.yaml
 +F:    drivers/media/platform/imx-jpeg
 +
  NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
  M:    Jonas Malaco <jonas@protocubo.io>
  L:    linux-hwmon@vger.kernel.org
@@@ -13525,7 -13319,7 +13525,7 @@@ M:   Rui Miguel Silva <rmfrfs@gmail.com
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/ov2680.yaml
 +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov2680.yaml
  F:    drivers/media/i2c/ov2680.c
  
  OMNIVISION OV2685 SENSOR DRIVER
@@@ -14033,14 -13827,6 +14033,14 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
  F:    drivers/pci/controller/dwc/*imx6*
  
 +PCI DRIVER FOR FU740
 +M:    Paul Walmsley <paul.walmsley@sifive.com>
 +M:    Greentime Hu <greentime.hu@sifive.com>
 +L:    linux-pci@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
 +F:    drivers/pci/controller/dwc/pcie-fu740.c
 +
  PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
  M:    Jonathan Derrick <jonathan.derrick@intel.com>
  L:    linux-pci@vger.kernel.org
@@@ -14125,6 -13911,13 +14125,6 @@@ F:  Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/cadence/pci-j721e.c
  F:    drivers/pci/controller/dwc/pci-dra7xx.c
  
 -PCI DRIVER FOR TI KEYSTONE
 -M:    Murali Karicheri <m-karicheri2@ti.com>
 -L:    linux-pci@vger.kernel.org
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    drivers/pci/controller/dwc/pci-keystone.c
 -
  PCI DRIVER FOR V3 SEMICONDUCTOR V360EPC
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-pci@vger.kernel.org
@@@ -14135,7 -13928,6 +14135,7 @@@ F:   drivers/pci/controller/pci-v3-semi.
  PCI ENDPOINT SUBSYSTEM
  M:    Kishon Vijay Abraham I <kishon@ti.com>
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +R:    Krzysztof Wilczyński <kw@linux.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    Documentation/PCI/endpoint/*
@@@ -14184,7 -13976,6 +14184,7 @@@ F:   drivers/pci/controller/pci-xgene-msi
  PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  R:    Rob Herring <robh@kernel.org>
 +R:    Krzysztof Wilczyński <kw@linux.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
  Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
@@@ -14243,6 -14034,7 +14243,6 @@@ PCIE DRIVER FOR HISILICO
  M:    Zhou Wang <wangzhou1@hisilicon.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
  F:    drivers/pci/controller/dwc/pcie-hisi.c
  
  PCIE DRIVER FOR HISILICON KIRIN
@@@ -14262,7 -14054,6 +14262,7 @@@ F:   drivers/pci/controller/dwc/pcie-hist
  
  PCIE DRIVER FOR MEDIATEK
  M:    Ryder Lee <ryder.lee@mediatek.com>
 +M:    Jianjun Wang <jianjun.wang@mediatek.com>
  L:    linux-pci@vger.kernel.org
  L:    linux-mediatek@lists.infradead.org
  S:    Supported
@@@ -14344,12 -14135,10 +14344,12 @@@ PER-CPU MEMORY ALLOCATO
  M:    Dennis Zhou <dennis@kernel.org>
  M:    Tejun Heo <tj@kernel.org>
  M:    Christoph Lameter <cl@linux.com>
 +L:    linux-mm@kvack.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git
  F:    arch/*/include/asm/percpu.h
  F:    include/linux/percpu*.h
 +F:    lib/percpu*.c
  F:    mm/percpu*.c
  
  PER-TASK DELAY ACCOUNTING
@@@ -14366,10 -14155,8 +14366,10 @@@ R: Mark Rutland <mark.rutland@arm.com
  R:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
  R:    Jiri Olsa <jolsa@redhat.com>
  R:    Namhyung Kim <namhyung@kernel.org>
 +L:    linux-perf-users@vger.kernel.org
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 +W:    https://perf.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  F:    arch/*/events/*
  F:    arch/*/events/*/*
@@@ -14451,7 -14238,7 +14451,7 @@@ L:   linux-gpio@vger.kernel.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
  F:    Documentation/devicetree/bindings/pinctrl/
 -F:    Documentation/driver-api/pinctl.rst
 +F:    Documentation/driver-api/pin-control.rst
  F:    drivers/pinctrl/
  F:    include/linux/pinctrl/
  
@@@ -14763,6 -14550,7 +14763,6 @@@ W:   https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/intersil/prism54/
  
  PROC FILESYSTEM
 -R:    Alexey Dobriyan <adobriyan@gmail.com>
  L:    linux-kernel@vger.kernel.org
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
@@@ -15139,7 -14927,7 +15139,7 @@@ M:   Todor Tomov <todor.too@gmail.com
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    Documentation/admin-guide/media/qcom_camss.rst
 -F:    Documentation/devicetree/bindings/media/qcom,camss.txt
 +F:    Documentation/devicetree/bindings/media/*camss*
  F:    drivers/media/platform/qcom/camss/
  
  QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
@@@ -15157,13 -14945,6 +15157,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
  F:    drivers/cpufreq/qcom-cpufreq-nvmem.c
  
 +QUALCOMM CRYPTO DRIVERS
 +M:    Thara Gopinath <thara.gopinath@linaro.org>
 +L:    linux-crypto@vger.kernel.org
 +L:    linux-arm-msm@vger.kernel.org
 +S:    Maintained
 +F:    drivers/crypto/qce/
 +
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <timur@kernel.org>
  L:    netdev@vger.kernel.org
@@@ -15258,7 -15039,6 +15258,7 @@@ F:   include/linux/if_rmnet.
  
  QUALCOMM TSENS THERMAL DRIVER
  M:    Amit Kucheria <amitk@kernel.org>
 +M:    Thara Gopinath <thara.gopinath@linaro.org>
  L:    linux-pm@vger.kernel.org
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
@@@ -15446,7 -15226,7 +15446,7 @@@ M:   Laurent Pinchart <laurent.pinchart+r
  M:    Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/media/i2c/rdacm2x-gmsl.yaml
 +F:    Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml
  F:    drivers/media/i2c/max9271.c
  F:    drivers/media/i2c/max9271.h
  F:    drivers/media/i2c/rdacm21.c
@@@ -15729,8 -15509,8 +15729,8 @@@ N:   risc
  K:    riscv
  
  RNBD BLOCK DRIVERS
 -M:    Danil Kipnis <danil.kipnis@cloud.ionos.com>
 -M:    Jack Wang <jinpu.wang@cloud.ionos.com>
 +M:    Md. Haris Iqbal <haris.iqbal@ionos.com>
 +M:    Jack Wang <jinpu.wang@ionos.com>
  L:    linux-block@vger.kernel.org
  S:    Maintained
  F:    drivers/block/rnbd/
@@@ -15816,27 -15596,20 +15816,27 @@@ F:        Documentation/devicetree/bindings/mf
  F:    Documentation/devicetree/bindings/regulator/rohm,bd70528-regulator.txt
  F:    drivers/clk/clk-bd718x7.c
  F:    drivers/gpio/gpio-bd70528.c
 +F:    drivers/gpio/gpio-bd71815.c
  F:    drivers/gpio/gpio-bd71828.c
  F:    drivers/mfd/rohm-bd70528.c
  F:    drivers/mfd/rohm-bd71828.c
  F:    drivers/mfd/rohm-bd718x7.c
 +F:    drivers/mfd/rohm-bd9576.c
  F:    drivers/power/supply/bd70528-charger.c
  F:    drivers/regulator/bd70528-regulator.c
 +F:    drivers/regulator/bd71815-regulator.c
  F:    drivers/regulator/bd71828-regulator.c
  F:    drivers/regulator/bd718x7-regulator.c
 +F:    drivers/regulator/bd9576-regulator.c
  F:    drivers/regulator/rohm-regulator.c
  F:    drivers/rtc/rtc-bd70528.c
  F:    drivers/watchdog/bd70528_wdt.c
 +F:    drivers/watchdog/bd9576_wdt.c
  F:    include/linux/mfd/rohm-bd70528.h
 +F:    include/linux/mfd/rohm-bd71815.h
  F:    include/linux/mfd/rohm-bd71828.h
  F:    include/linux/mfd/rohm-bd718x7.h
 +F:    include/linux/mfd/rohm-bd957x.h
  F:    include/linux/mfd/rohm-generic.h
  F:    include/linux/mfd/rohm-shared.h
  
@@@ -15850,7 -15623,7 +15850,7 @@@ F:   include/uapi/linux/rose.
  F:    net/rose/
  
  ROTATION DRIVER FOR ALLWINNER A83T
 -M:    Jernej Skrabec <jernej.skrabec@siol.net>
 +M:    Jernej Skrabec <jernej.skrabec@gmail.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -15912,15 -15685,14 +15912,15 @@@ T:        git git://git.kernel.org/pub/scm/lin
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
  RTRS TRANSPORT DRIVERS
 -M:    Danil Kipnis <danil.kipnis@cloud.ionos.com>
 -M:    Jack Wang <jinpu.wang@cloud.ionos.com>
 +M:    Md. Haris Iqbal <haris.iqbal@ionos.com>
 +M:    Jack Wang <jinpu.wang@ionos.com>
  L:    linux-rdma@vger.kernel.org
  S:    Maintained
  F:    drivers/infiniband/ulp/rtrs/
  
  RXRPC SOCKETS (AF_RXRPC)
  M:    David Howells <dhowells@redhat.com>
 +M:    Marc Dionne <marc.dionne@auristor.com>
  L:    linux-afs@lists.infradead.org
  S:    Supported
  W:    https://www.infradead.org/~dhowells/kafs/
@@@ -15980,7 -15752,6 +15980,7 @@@ S390 IUCV NETWORK LAYE
  M:    Julian Wiedmann <jwi@linux.ibm.com>
  M:    Karsten Graul <kgraul@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
 +L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
  F:    drivers/s390/net/*iucv*
@@@ -15991,7 -15762,6 +15991,7 @@@ S390 NETWORK DRIVER
  M:    Julian Wiedmann <jwi@linux.ibm.com>
  M:    Karsten Graul <kgraul@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
 +L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
  F:    drivers/s390/net/
@@@ -16054,13 -15824,6 +16054,13 @@@ S: Supporte
  W:    http://www.ibm.com/developerworks/linux/linux390/
  F:    drivers/s390/scsi/zfcp_*
  
 +S3C ADC BATTERY DRIVER
 +M:    Krzysztof Kozlowski <krzk@kernel.org>
 +L:    linux-samsung-soc@vger.kernel.org
 +S:    Odd Fixes
 +F:    drivers/power/supply/s3c_adc_battery.c
 +F:    include/linux/s3c_adc_battery.h
 +
  S3C24XX SD/MMC Driver
  M:    Ben Dooks <ben-linux@fluff.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -16170,7 -15933,7 +16170,7 @@@ F:   include/media/drv-intf/s3c_camif.
  SAMSUNG S3FWRN5 NFC DRIVER
  M:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
  M:    Krzysztof Opasiak <k.opasiak@samsung.com>
 -L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 +L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
  F:    drivers/nfc/s3fwrn5
@@@ -16583,7 -16346,6 +16583,7 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Karsten Graul <kgraul@linux.ibm.com>
 +M:    Guvenc Gulce <guvenc@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -17029,13 -16791,6 +17029,13 @@@ S: Maintaine
  F:    drivers/ssb/
  F:    include/linux/ssb/
  
 +SONY IMX208 SENSOR DRIVER
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/imx208.c
 +
  SONY IMX214 SENSOR DRIVER
  M:    Ricardo Ribalda <ribalda@kernel.org>
  L:    linux-media@vger.kernel.org
@@@ -17349,12 -17104,6 +17349,12 @@@ L: linux-i2c@vger.kernel.or
  S:    Maintained
  F:    drivers/i2c/busses/i2c-stm32*
  
 +ST STM32 SPI DRIVER
 +M:    Alain Volmat <alain.volmat@foss.st.com>
 +L:    linux-spi@vger.kernel.org
 +S:    Maintained
 +F:    drivers/spi/spi-stm32.c
 +
  ST STPDDC60 DRIVER
  M:    Daniel Nilsson <daniel.nilsson@flex.com>
  L:    linux-hwmon@vger.kernel.org
@@@ -17680,7 -17429,7 +17680,7 @@@ F:   drivers/spi/spi-dw
  SYNOPSYS DESIGNWARE AXI DMAC DRIVER
  M:    Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt
 +F:    Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml
  F:    drivers/dma/dw-axi-dmac/
  
  SYNOPSYS DESIGNWARE DMAC DRIVER
@@@ -17713,6 -17462,7 +17713,6 @@@ R:   Mika Westerberg <mika.westerberg@lin
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    drivers/i2c/busses/i2c-designware-*
 -F:    include/linux/platform_data/i2c-designware.h
  
  SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
  M:    Jaehoon Chung <jh80.chung@samsung.com>
@@@ -18179,7 -17929,7 +18179,7 @@@ THERMAL/CPU_COOLIN
  M:    Amit Daniel Kachhap <amit.kachhap@gmail.com>
  M:    Daniel Lezcano <daniel.lezcano@linaro.org>
  M:    Viresh Kumar <viresh.kumar@linaro.org>
 -M:    Javi Merino <javi.merino@kernel.org>
 +R:    Lukasz Luba <lukasz.luba@arm.com>
  L:    linux-pm@vger.kernel.org
  S:    Supported
  F:    Documentation/driver-api/thermal/cpu-cooling-api.rst
@@@ -18352,6 -18102,36 +18352,6 @@@ S:  Maintaine
  F:    sound/soc/codecs/isabelle*
  F:    sound/soc/codecs/lm49453*
  
 -TI LP855x BACKLIGHT DRIVER
 -M:    Milo Kim <milo.kim@ti.com>
 -S:    Maintained
 -F:    Documentation/driver-api/backlight/lp855x-driver.rst
 -F:    drivers/video/backlight/lp855x_bl.c
 -F:    include/linux/platform_data/lp855x.h
 -
 -TI LP8727 CHARGER DRIVER
 -M:    Milo Kim <milo.kim@ti.com>
 -S:    Maintained
 -F:    drivers/power/supply/lp8727_charger.c
 -F:    include/linux/platform_data/lp8727.h
 -
 -TI LP8788 MFD DRIVER
 -M:    Milo Kim <milo.kim@ti.com>
 -S:    Maintained
 -F:    drivers/iio/adc/lp8788_adc.c
 -F:    drivers/leds/leds-lp8788.c
 -F:    drivers/mfd/lp8788*.c
 -F:    drivers/power/supply/lp8788-charger.c
 -F:    drivers/regulator/lp8788-*.c
 -F:    include/linux/mfd/lp8788*.h
 -
 -TI NETCP ETHERNET DRIVER
 -M:    Wingman Kwok <w-kwok2@ti.com>
 -M:    Murali Karicheri <m-karicheri2@ti.com>
 -L:    netdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/net/ethernet/ti/netcp*
 -
  TI PCM3060 ASoC CODEC DRIVER
  M:    Kirill Marinushkin <kmarinushkin@birdec.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -18365,10 -18145,16 +18365,10 @@@ L:        alsa-devel@alsa-project.org (moderat
  S:    Odd Fixes
  F:    sound/soc/codecs/tas571x*
  
 -TI TCAN4X5X DEVICE DRIVER
 -L:    linux-can@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/net/can/tcan4x5x.txt
 -F:    drivers/net/can/m_can/tcan4x5x*
 -
  TI TRF7970A NFC DRIVER
  M:    Mark Greer <mgreer@animalcreek.com>
  L:    linux-wireless@vger.kernel.org
 -L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 +L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Supported
  F:    Documentation/devicetree/bindings/net/nfc/trf7970a.txt
  F:    drivers/nfc/trf7970a.c
@@@ -18904,13 -18690,6 +18904,13 @@@ S: Maintaine
  F:    drivers/usb/host/isp116x*
  F:    include/linux/usb/isp116x.h
  
 +USB ISP1760 DRIVER
 +M:    Rui Miguel Silva <rui.silva@linaro.org>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    drivers/usb/isp1760/*
 +F:    Documentation/devicetree/bindings/usb/nxp,isp1760.yaml
 +
  USB LAN78XX ETHERNET DRIVER
  M:    Woojung Huh <woojung.huh@microchip.com>
  M:    UNGLinuxDriver@microchip.com
@@@ -19471,15 -19250,6 +19471,15 @@@ W: https://virtio-mem.gitlab.io
  F:    drivers/virtio/virtio_mem.c
  F:    include/uapi/linux/virtio_mem.h
  
 +VIRTIO SOUND DRIVER
 +M:    Anton Yakovlev <anton.yakovlev@opensynergy.com>
 +M:    "Michael S. Tsirkin" <mst@redhat.com>
 +L:    virtualization@lists.linux-foundation.org
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    include/uapi/linux/virtio_snd.h
 +F:    sound/virtio/*
 +
  VIRTUAL BOX GUEST DEVICE DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  M:    Arnd Bergmann <arnd@arndb.de>
@@@ -19608,10 -19378,6 +19608,10 @@@ F: include/dt-bindings/regulator
  F:    include/linux/regulator/
  K:    regulator_get_optional
  
 +VOLTAGE AND CURRENT REGULATOR IRQ HELPERS
 +R:    Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
 +F:    drivers/regulator/irq_helpers.c
 +
  VRF
  M:    David Ahern <dsahern@kernel.org>
  L:    netdev@vger.kernel.org
@@@ -19629,6 -19395,7 +19629,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git
  F:    Documentation/core-api/printk-formats.rst
  F:    lib/test_printf.c
+ F:    lib/test_scanf.c
  F:    lib/vsprintf.c
  
  VT1211 HARDWARE MONITOR DRIVER
@@@ -19776,6 -19543,7 +19777,6 @@@ F:   Documentation/devicetree/bindings/so
  F:    Documentation/hwmon/wm83??.rst
  F:    arch/arm/mach-s3c/mach-crag6410*
  F:    drivers/clk/clk-wm83*.c
 -F:    drivers/extcon/extcon-arizona.c
  F:    drivers/gpio/gpio-*wm*.c
  F:    drivers/gpio/gpio-arizona.c
  F:    drivers/hwmon/wm83??-hwmon.c
@@@ -19799,7 -19567,7 +19800,7 @@@ F:   include/linux/mfd/wm8400
  F:    include/linux/regulator/arizona*
  F:    include/linux/wm97xx.h
  F:    include/sound/wm????.h
 -F:    sound/soc/codecs/arizona.?
 +F:    sound/soc/codecs/arizona*
  F:    sound/soc/codecs/cs47l24*
  F:    sound/soc/codecs/wm*
  
@@@ -20059,7 -19827,6 +20060,7 @@@ F:   arch/x86/xen/*swiotlb
  F:    drivers/xen/*swiotlb*
  
  XFS FILESYSTEM
 +C:    irc://irc.oftc.net/xfs
  M:    Darrick J. Wong <djwong@kernel.org>
  M:    linux-xfs@vger.kernel.org
  L:    linux-xfs@vger.kernel.org
diff --combined fs/nilfs2/sysfs.c
index 9c6c0e2e5880ae6a7c51dbf837bebdaaa52a2248,4e10423f04481d457c9c939537293b75beefafc6..68e8d61e28dd5392af68045ff0ea206ea24a2e9c
--- 1/fs/nilfs2/sysfs.c
--- 2/fs/nilfs2/sysfs.c
+++ b/fs/nilfs2/sysfs.c
@@@ -19,19 -19,6 +19,6 @@@
  /* /sys/fs/<nilfs>/ */
  static struct kset *nilfs_kset;
  
- #define NILFS_SHOW_TIME(time_t_val, buf) ({ \
-               struct tm res; \
-               int count = 0; \
-               time64_to_tm(time_t_val, 0, &res); \
-               res.tm_year += 1900; \
-               res.tm_mon += 1; \
-               count = scnprintf(buf, PAGE_SIZE, \
-                                   "%ld-%.2d-%.2d %.2d:%.2d:%.2d\n", \
-                                   res.tm_year, res.tm_mon, res.tm_mday, \
-                                   res.tm_hour, res.tm_min, res.tm_sec);\
-               count; \
- })
- 
  #define NILFS_DEV_INT_GROUP_OPS(name, parent_name) \
  static ssize_t nilfs_##name##_attr_show(struct kobject *kobj, \
                                        struct attribute *attr, char *buf) \
@@@ -576,7 -563,7 +563,7 @@@ nilfs_segctor_last_seg_write_time_show(
        ctime = nilfs->ns_ctime;
        up_read(&nilfs->ns_segctor_sem);
  
-       return NILFS_SHOW_TIME(ctime, buf);
+       return sysfs_emit(buf, "%ptTs\n", &ctime);
  }
  
  static ssize_t
@@@ -604,7 -591,7 +591,7 @@@ nilfs_segctor_last_nongc_write_time_sho
        nongc_ctime = nilfs->ns_nongc_ctime;
        up_read(&nilfs->ns_segctor_sem);
  
-       return NILFS_SHOW_TIME(nongc_ctime, buf);
+       return sysfs_emit(buf, "%ptTs\n", &nongc_ctime);
  }
  
  static ssize_t
@@@ -724,7 -711,7 +711,7 @@@ nilfs_superblock_sb_write_time_show(str
        sbwtime = nilfs->ns_sbwtime;
        up_read(&nilfs->ns_sem);
  
-       return NILFS_SHOW_TIME(sbwtime, buf);
+       return sysfs_emit(buf, "%ptTs\n", &sbwtime);
  }
  
  static ssize_t
@@@ -1053,7 -1040,6 +1040,7 @@@ void nilfs_sysfs_delete_device_group(st
        nilfs_sysfs_delete_superblock_group(nilfs);
        nilfs_sysfs_delete_segctor_group(nilfs);
        kobject_del(&nilfs->ns_dev_kobj);
 +      kobject_put(&nilfs->ns_dev_kobj);
        kfree(nilfs->ns_dev_subgroups);
  }
  
diff --combined lib/Kconfig.debug
index 1e1bd6f4a13dedd5ba97453344be2c0ec94477e2,dc437a171c0fc45bc47aa8b51ad2678f3778e58f..a0e1910d0a1659ee84724fd0f61a2940d808ff73
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -284,7 -284,8 +284,7 @@@ config DEBUG_INFO_DWARF
  
  config DEBUG_INFO_DWARF5
        bool "Generate DWARF Version 5 debuginfo"
 -      depends on GCC_VERSION >= 50000 || CC_IS_CLANG
 -      depends on CC_IS_GCC || $(success,$(srctree)/scripts/test_dwarf5_support.sh $(CC) $(CLANG_FLAGS))
 +      depends on GCC_VERSION >= 50000 || (CC_IS_CLANG && (AS_IS_LLVM || (AS_IS_GNU && AS_VERSION >= 23502)))
        depends on !DEBUG_INFO_BTF
        help
          Generate DWARF v5 debug info. Requires binutils 2.35.2, gcc 5.0+ (gcc
@@@ -448,16 -449,6 +448,16 @@@ config VMLINUX_VALIDATIO
        depends on STACK_VALIDATION && DEBUG_ENTRY && !PARAVIRT
        default y
  
 +config VMLINUX_MAP
 +      bool "Generate vmlinux.map file when linking"
 +      depends on EXPERT
 +      help
 +        Selecting this option will pass "-Map=vmlinux.map" to ld
 +        when linking vmlinux. That file can be useful for verifying
 +        and debugging magic section games, and for seeing which
 +        pieces of code get eliminated with
 +        CONFIG_LD_DEAD_CODE_DATA_ELIMINATION.
 +
  config DEBUG_FORCE_WEAK_PER_CPU
        bool "Force weak per-cpu definitions"
        depends on DEBUG_KERNEL
@@@ -1372,6 -1363,7 +1372,6 @@@ config LOCKDE
        bool
        depends on DEBUG_KERNEL && LOCK_DEBUGGING_SUPPORT
        select STACKTRACE
 -      depends on FRAME_POINTER || MIPS || PPC || S390 || MICROBLAZE || ARM || ARC || X86
        select KALLSYMS
        select KALLSYMS_ALL
  
@@@ -1718,6 -1710,7 +1718,6 @@@ config LATENCYTO
        select KALLSYMS_ALL
        select STACKTRACE
        select SCHEDSTATS
 -      select SCHED_DEBUG
        help
          Enable this option if you want to use the LatencyTOP tool
          to find out which userspace is blocking on what kernel operations.
@@@ -2074,16 -2067,6 +2074,16 @@@ config TEST_SOR
  
          If unsure, say N.
  
 +config TEST_DIV64
 +      tristate "64bit/32bit division and modulo test"
 +      depends on DEBUG_KERNEL || m
 +      help
 +        Enable this to turn on 'do_div()' function test. This test is
 +        executed only once during system boot (so affects only boot time),
 +        or at module load time.
 +
 +        If unsure, say N.
 +
  config KPROBES_SANITY_TEST
        bool "Kprobes sanity tests"
        depends on DEBUG_KERNEL
@@@ -2180,6 -2163,9 +2180,9 @@@ config TEST_KSTRTO
  config TEST_PRINTF
        tristate "Test printf() family of functions at runtime"
  
+ config TEST_SCANF
+       tristate "Test scanf() family of functions at runtime"
+ 
  config TEST_BITMAP
        tristate "Test bitmap_*() family of functions at runtime"
        help
@@@ -2572,18 -2558,11 +2575,18 @@@ config TEST_FP
  
  endif # RUNTIME_TESTING_MENU
  
 +config ARCH_USE_MEMTEST
 +      bool
 +      help
 +        An architecture should select this when it uses early_memtest()
 +        during boot process.
 +
  config MEMTEST
        bool "Memtest"
 +      depends on ARCH_USE_MEMTEST
        help
          This option adds a kernel parameter 'memtest', which allows memtest
 -        to be set.
 +        to be set and executed.
                memtest=0, mean disabled; -- default
                memtest=1, mean do 1 test pattern;
                ...
diff --combined lib/Makefile
index 2cc359ec1fdd3e1c7115bdc0dfbeaa0f59118bd9,5f7f246241b1c1591c34e4da0f41c573219883a2..a93f08038a25666a283595ec0ad19f7860fbd76b
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -83,6 -83,7 +83,7 @@@ obj-$(CONFIG_TEST_USER_COPY) += test_us
  obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_keys.o
  obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_key_base.o
  obj-$(CONFIG_TEST_PRINTF) += test_printf.o
+ obj-$(CONFIG_TEST_SCANF) += test_scanf.o
  obj-$(CONFIG_TEST_BITMAP) += test_bitmap.o
  obj-$(CONFIG_TEST_STRSCPY) += test_strscpy.o
  obj-$(CONFIG_TEST_UUID) += test_uuid.o
@@@ -348,7 -349,6 +349,7 @@@ obj-$(CONFIG_OBJAGG) += objagg.
  obj-$(CONFIG_PLDMFW) += pldmfw/
  
  # KUnit tests
 +CFLAGS_bitfield_kunit.o := $(call cc-option,-Wframe-larger-than=10240)
  obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o
  obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o
  obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o
diff --combined lib/test_printf.c
index ec0d5976bb69af7904fd5340c2b4daf61d808fa7,69b04b531492d4054e7ce3bef9b83616c7559d94..8ac71aee46af09a3f76b8e66e73ee4934c5f3fbd
--- 1/lib/test_printf.c
--- 2/lib/test_printf.c
+++ b/lib/test_printf.c
@@@ -528,6 -528,11 +528,11 @@@ time_and_date(void
        test("0119-00-04T15:32:23", "%ptTr", &t);
        test("15:32:23|2019-01-04", "%ptTt|%ptTd", &t, &t);
        test("15:32:23|0119-00-04", "%ptTtr|%ptTdr", &t, &t);
+ 
+       test("2019-01-04 15:32:23", "%ptTs", &t);
+       test("0119-00-04 15:32:23", "%ptTsr", &t);
+       test("15:32:23|2019-01-04", "%ptTts|%ptTds", &t, &t);
+       test("15:32:23|0119-00-04", "%ptTtrs|%ptTdrs", &t, &t);
  }
  
  static void __init
@@@ -725,23 -730,6 +730,23 @@@ static void __init fwnode_pointer(void
        software_node_unregister_nodes(softnodes);
  }
  
 +static void __init fourcc_pointer(void)
 +{
 +      struct {
 +              u32 code;
 +              char *str;
 +      } const try[] = {
 +              { 0x3231564e, "NV12 little-endian (0x3231564e)", },
 +              { 0xb231564e, "NV12 big-endian (0xb231564e)", },
 +              { 0x10111213, ".... little-endian (0x10111213)", },
 +              { 0x20303159, "Y10  little-endian (0x20303159)", },
 +      };
 +      unsigned int i;
 +
 +      for (i = 0; i < ARRAY_SIZE(try); i++)
 +              test(try[i].str, "%p4cc", &try[i].code);
 +}
 +
  static void __init
  errptr(void)
  {
@@@ -787,7 -775,6 +792,7 @@@ test_pointer(void
        flags();
        errptr();
        fwnode_pointer();
 +      fourcc_pointer();
  }
  
  static void __init selftest(void)
diff --combined lib/vsprintf.c
index f0c35d9b65bffd921eda30f9e8d83eab1d2abfb2,18818d9669288f980511008e4c093927ba950f79..ea65ec51e63b59de0c3b583836957bb95d7f8f91
--- 1/lib/vsprintf.c
--- 2/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@@ -53,6 -53,31 +53,31 @@@
  #include <linux/string_helpers.h>
  #include "kstrtox.h"
  
+ static unsigned long long simple_strntoull(const char *startp, size_t max_chars,
+                                          char **endp, unsigned int base)
+ {
+       const char *cp;
+       unsigned long long result = 0ULL;
+       size_t prefix_chars;
+       unsigned int rv;
+ 
+       cp = _parse_integer_fixup_radix(startp, &base);
+       prefix_chars = cp - startp;
+       if (prefix_chars < max_chars) {
+               rv = _parse_integer_limit(cp, base, &result, max_chars - prefix_chars);
+               /* FIXME */
+               cp += (rv & ~KSTRTOX_OVERFLOW);
+       } else {
+               /* Field too short for prefix + digit, skip over without converting */
+               cp = startp + max_chars;
+       }
+ 
+       if (endp)
+               *endp = (char *)cp;
+ 
+       return result;
+ }
+ 
  /**
   * simple_strtoull - convert a string to an unsigned long long
   * @cp: The start of the string
@@@ -63,18 -88,7 +88,7 @@@
   */
  unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base)
  {
-       unsigned long long result;
-       unsigned int rv;
- 
-       cp = _parse_integer_fixup_radix(cp, &base);
-       rv = _parse_integer(cp, base, &result);
-       /* FIXME */
-       cp += (rv & ~KSTRTOX_OVERFLOW);
- 
-       if (endp)
-               *endp = (char *)cp;
- 
-       return result;
+       return simple_strntoull(cp, INT_MAX, endp, base);
  }
  EXPORT_SYMBOL(simple_strtoull);
  
@@@ -109,6 -123,21 +123,21 @@@ long simple_strtol(const char *cp, cha
  }
  EXPORT_SYMBOL(simple_strtol);
  
+ static long long simple_strntoll(const char *cp, size_t max_chars, char **endp,
+                                unsigned int base)
+ {
+       /*
+        * simple_strntoull() safely handles receiving max_chars==0 in the
+        * case cp[0] == '-' && max_chars == 1.
+        * If max_chars == 0 we can drop through and pass it to simple_strntoull()
+        * and the content of *cp is irrelevant.
+        */
+       if (*cp == '-' && max_chars > 0)
+               return -simple_strntoull(cp + 1, max_chars - 1, endp, base);
+ 
+       return simple_strntoull(cp, max_chars, endp, base);
+ }
+ 
  /**
   * simple_strtoll - convert a string to a signed long long
   * @cp: The start of the string
@@@ -119,10 -148,7 +148,7 @@@
   */
  long long simple_strtoll(const char *cp, char **endp, unsigned int base)
  {
-       if (*cp == '-')
-               return -simple_strtoull(cp + 1, endp, base);
- 
-       return simple_strtoull(cp, endp, base);
+       return simple_strntoll(cp, INT_MAX, endp, base);
  }
  EXPORT_SYMBOL(simple_strtoll);
  
@@@ -1733,42 -1759,6 +1759,42 @@@ char *netdev_bits(char *buf, char *end
        return special_hex_number(buf, end, num, size);
  }
  
 +static noinline_for_stack
 +char *fourcc_string(char *buf, char *end, const u32 *fourcc,
 +                  struct printf_spec spec, const char *fmt)
 +{
 +      char output[sizeof("0123 little-endian (0x01234567)")];
 +      char *p = output;
 +      unsigned int i;
 +      u32 val;
 +
 +      if (fmt[1] != 'c' || fmt[2] != 'c')
 +              return error_string(buf, end, "(%p4?)", spec);
 +
 +      if (check_pointer(&buf, end, fourcc, spec))
 +              return buf;
 +
 +      val = *fourcc & ~BIT(31);
 +
 +      for (i = 0; i < sizeof(*fourcc); i++) {
 +              unsigned char c = val >> (i * 8);
 +
 +              /* Print non-control ASCII characters as-is, dot otherwise */
 +              *p++ = isascii(c) && isprint(c) ? c : '.';
 +      }
 +
 +      strcpy(p, *fourcc & BIT(31) ? " big-endian" : " little-endian");
 +      p += strlen(p);
 +
 +      *p++ = ' ';
 +      *p++ = '(';
 +      p = special_hex_number(p, output + sizeof(output) - 2, *fourcc, sizeof(u32));
 +      *p++ = ')';
 +      *p = '\0';
 +
 +      return string(buf, end, output, spec);
 +}
 +
  static noinline_for_stack
  char *address_val(char *buf, char *end, const void *addr,
                  struct printf_spec spec, const char *fmt)
@@@ -1834,7 -1824,8 +1860,8 @@@ char *rtc_str(char *buf, char *end, con
              struct printf_spec spec, const char *fmt)
  {
        bool have_t = true, have_d = true;
-       bool raw = false;
+       bool raw = false, iso8601_separator = true;
+       bool found = true;
        int count = 2;
  
        if (check_pointer(&buf, end, tm, spec))
@@@ -1851,14 -1842,25 +1878,25 @@@
                break;
        }
  
-       raw = fmt[count] == 'r';
+       do {
+               switch (fmt[count++]) {
+               case 'r':
+                       raw = true;
+                       break;
+               case 's':
+                       iso8601_separator = false;
+                       break;
+               default:
+                       found = false;
+                       break;
+               }
+       } while (found);
  
        if (have_d)
                buf = date_str(buf, end, tm, raw);
        if (have_d && have_t) {
-               /* Respect ISO 8601 */
                if (buf < end)
-                       *buf = 'T';
+                       *buf = iso8601_separator ? 'T' : ' ';
                buf++;
        }
        if (have_t)
@@@ -2285,7 -2287,6 +2323,7 @@@ early_param("no_hash_pointers", no_hash
   *       Use only for procfs, sysfs and similar files, not printk(); please
   *       read the documentation (path below) first.
   * - 'NF' For a netdev_features_t
 + * - '4cc' V4L2 or DRM FourCC code, with endianness and raw numerical value.
   * - 'h[CDN]' For a variable-length buffer, it prints it as a hex string with
   *            a certain separator (' ' by default):
   *              C colon
@@@ -2298,7 -2299,7 +2336,7 @@@
   * - 'd[234]' For a dentry name (optionally 2-4 last components)
   * - 'D[234]' Same as 'd' but for a struct file
   * - 'g' For block_device name (gendisk + partition number)
-  * - 't[RT][dt][r]' For time and date as represented by:
+  * - 't[RT][dt][r][s]' For time and date as represented by:
   *      R    struct rtc_time
   *      T    time64_t
   * - 'C' For a clock, it prints the name (Common Clock Framework) or address
@@@ -2384,8 -2385,6 +2422,8 @@@ char *pointer(const char *fmt, char *bu
                return restricted_pointer(buf, end, ptr, spec);
        case 'N':
                return netdev_bits(buf, end, ptr, spec, fmt);
 +      case '4':
 +              return fourcc_string(buf, end, ptr, spec, fmt);
        case 'a':
                return address_val(buf, end, ptr, spec, fmt);
        case 'd':
@@@ -3565,8 -3564,12 +3603,12 @@@ int vsscanf(const char *buf, const cha
                str = skip_spaces(str);
  
                digit = *str;
-               if (is_sign && digit == '-')
+               if (is_sign && digit == '-') {
+                       if (field_width == 1)
+                               break;
+ 
                        digit = *(str + 1);
+               }
  
                if (!digit
                    || (base == 16 && !isxdigit(digit))
@@@ -3576,25 -3579,13 +3618,13 @@@
                        break;
  
                if (is_sign)
-                       val.s = qualifier != 'L' ?
-                               simple_strtol(str, &next, base) :
-                               simple_strtoll(str, &next, base);
+                       val.s = simple_strntoll(str,
+                                               field_width >= 0 ? field_width : INT_MAX,
+                                               &next, base);
                else
-                       val.u = qualifier != 'L' ?
-                               simple_strtoul(str, &next, base) :
-                               simple_strtoull(str, &next, base);
- 
-               if (field_width > 0 && next - str > field_width) {
-                       if (base == 0)
-                               _parse_integer_fixup_radix(str, &base);
-                       while (next - str > field_width) {
-                               if (is_sign)
-                                       val.s = div_s64(val.s, base);
-                               else
-                                       val.u = div_u64(val.u, base);
-                               --next;
-                       }
-               }
+                       val.u = simple_strntoull(str,
+                                                field_width >= 0 ? field_width : INT_MAX,
+                                                &next, base);
  
                switch (qualifier) {
                case 'H':       /* that's 'hh' in format */
Linux 6.x block layer and io_uring tree(s)