The following commit has been merged in the master branch: commit 2bd178c5ea73ab66ac8496960c4a4d9acdef5c24 Merge: 2f8a786f472445d66348859af8795aa6ffd9ff8c f3e893626abeac3cdd9ba41d3395dc6c1b7d5ad6 Author: Jakub Kicinski kuba@kernel.org Date: Mon Sep 19 14:21:53 2022 -0700

Merge tag 'ib-mfd-net-pinctrl-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

Lee Jones says:

==================== Immutable branch between MFD, Net and Pinctrl due for the v6.0 merge window

* tag 'ib-mfd-net-pinctrl-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: mfd: ocelot: Add support for the vsc7512 chip via spi dt-bindings: mfd: ocelot: Add bindings for VSC7512 resource: add define macro for register address resources pinctrl: microchip-sgpio: add ability to be used in a non-mmio configuration pinctrl: microchip-sgpio: allow sgpio driver to be used as a module pinctrl: ocelot: add ability to be used in a non-mmio configuration net: mdio: mscc-miim: add ability to be used in a non-mmio configuration mfd: ocelot: Add helper to get regmap from a resource ====================

Link: https://lore.kernel.org/r/YxrjyHcceLOFlT/c@google.com Signed-off-by: Jakub Kicinski kuba@kernel.org

diff --combined MAINTAINERS index 74036b51911d,90a873dd04b0..6705fb8bfd3a --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -878,13 -878,6 +878,13 @@@ L: netdev@vger.kernel.or S: Maintained F: drivers/net/ethernet/altera/

+ALTERA TSE PCS +M: Maxime Chevallier maxime.chevallier@bootlin.com +L: netdev@vger.kernel.org +S: Supported +F: drivers/net/pcs/pcs-altera-tse.c +F: include/linux/pcs-altera-tse.h + ALTERA UART/JTAG UART SERIAL DRIVERS M: Tobias Klauser tklauser@distanz.ch L: linux-serial@vger.kernel.org @@@ -2185,7 -2178,7 +2185,7 @@@ M: Jean-Marie Verdun <verdun@hpe.com M: Nick Hawkins nick.hawkins@hpe.com S: Maintained F: Documentation/devicetree/bindings/arm/hpe,gxp.yaml -F: Documentation/devicetree/bindings/spi/hpe,gxp-spi.yaml +F: Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml F: Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml F: arch/arm/boot/dts/hpe-bmc* F: arch/arm/boot/dts/hpe-gxp* @@@ -3619,7 -3612,6 +3619,7 @@@ F: include/linux/find. F: include/linux/nodemask.h F: lib/bitmap.c F: lib/cpumask.c +F: lib/cpumask_kunit.c F: lib/find_bit.c F: lib/find_bit_benchmark.c F: lib/test_bitmap.c @@@ -3687,7 -3679,6 +3687,7 @@@ F: Documentation/networking/bonding.rs F: drivers/net/bonding/ F: include/net/bond* F: include/uapi/linux/if_bonding.h +F: tools/testing/selftests/drivers/net/bonding/

BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER M: Dan Robertson dan@dlrobertson.com @@@ -5154,7 -5145,6 +5154,7 @@@ T: git git://git.samba.org/sfrench/cifs F: Documentation/admin-guide/cifs/ F: fs/cifs/ F: fs/smbfs_common/ +F: include/uapi/linux/cifs

COMPACTPCI HOTPLUG CORE M: Scott Murray scott@spiteful.org @@@ -5729,6 -5719,13 +5729,6 @@@ F: include/linux/tfrc. F: include/uapi/linux/dccp.h F: net/dccp/

-DECnet NETWORK LAYER -L: linux-decnet-user@lists.sourceforge.net -S: Orphan -W: http://linux-decnet.sourceforge.net -F: Documentation/networking/decnet.rst -F: net/decnet/ - DECSTATION PLATFORM SUPPORT M: "Maciej W. Rozycki" macro@orcam.me.uk L: linux-mips@vger.kernel.org @@@ -9783,7 -9780,7 +9783,7 @@@ M: Christian Brauner <brauner@kernel.or M: Seth Forshee sforshee@kernel.org L: linux-fsdevel@vger.kernel.org S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git +T: git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git F: Documentation/filesystems/idmappings.rst F: tools/testing/selftests/mount_setattr/ F: include/linux/mnt_idmapping.h @@@ -10032,7 -10029,6 +10032,7 @@@ F: Documentation/devicetree/bindings/in F: Documentation/devicetree/bindings/serio/ F: Documentation/input/ F: drivers/input/ +F: include/dt-bindings/input/ F: include/linux/input.h F: include/linux/input/ F: include/uapi/linux/input-event-codes.h @@@ -10661,7 -10657,6 +10661,7 @@@ T: git git://git.kernel.dk/linux-bloc T: git git://git.kernel.dk/liburing F: io_uring/ F: include/linux/io_uring.h +F: include/linux/io_uring_types.h F: include/uapi/linux/io_uring.h F: tools/io_uring/

@@@ -14746,6 -14741,13 +14746,13 @@@ F: net/dsa/tag_ocelot. F: net/dsa/tag_ocelot_8021q.c F: tools/testing/selftests/drivers/net/ocelot/*

+ OCELOT EXTERNAL SWITCH CONTROL + M: Colin Foster colin.foster@in-advantage.com + S: Supported + F: Documentation/devicetree/bindings/mfd/mscc,ocelot.yaml + F: drivers/mfd/ocelot* + F: include/linux/mfd/ocelot.h + OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER M: Frederic Barrat fbarrat@linux.ibm.com M: Andrew Donnellan ajd@linux.ibm.com @@@ -17532,19 -17534,9 +17539,19 @@@ M: Conor Dooley <conor.dooley@microchip M: Daire McNamara daire.mcnamara@microchip.com L: linux-riscv@lists.infradead.org S: Supported +F: Documentation/devicetree/bindings/clock/microchip,mpfs.yaml +F: Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml +F: Documentation/devicetree/bindings/i2c/microchip,corei2c.yaml +F: Documentation/devicetree/bindings/mailbox/microchip,mpfs-mailbox.yaml +F: Documentation/devicetree/bindings/net/can/microchip,mpfs-can.yaml +F: Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml +F: Documentation/devicetree/bindings/soc/microchip/microchip,mpfs-sys-controller.yaml +F: Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml +F: Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml F: arch/riscv/boot/dts/microchip/ F: drivers/char/hw_random/mpfs-rng.c F: drivers/clk/microchip/clk-mpfs.c +F: drivers/i2c/busses/i2c-microchip-core.c F: drivers/mailbox/mailbox-mpfs.c F: drivers/pci/controller/pcie-microchip-host.c F: drivers/rtc/rtc-mpfs.c @@@ -20775,7 -20767,6 +20782,7 @@@ UBLK USERSPACE BLOCK DRIVE M: Ming Lei ming.lei@redhat.com L: linux-block@vger.kernel.org S: Maintained +F: Documentation/block/ublk.rst F: drivers/block/ublk_drv.c F: include/uapi/linux/ublk_cmd.h

@@@ -21859,11 -21850,9 +21866,11 @@@ F: drivers/input/tablet/wacom_serial4.

WANGXUN ETHERNET DRIVER M: Jiawen Wu jiawenwu@trustnetic.com +M: Mengyuan Lou mengyuanlou@net-swift.com +W: https://www.net-swift.com L: netdev@vger.kernel.org S: Maintained -F: Documentation/networking/device_drivers/ethernet/wangxun/txgbe.rst +F: Documentation/networking/device_drivers/ethernet/wangxun/* F: drivers/net/ethernet/wangxun/

WATCHDOG DEVICE DRIVERS @@@ -22319,7 -22308,7 +22326,7 @@@ M: Shubhrajyoti Datta <shubhrajyoti.dat R: Srinivas Neeli srinivas.neeli@xilinx.com R: Michal Simek michal.simek@xilinx.com S: Maintained -F: Documentation/devicetree/bindings/gpio/gpio-xilinx.txt +F: Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml F: Documentation/devicetree/bindings/gpio/gpio-zynq.yaml F: drivers/gpio/gpio-xilinx.c F: drivers/gpio/gpio-zynq.c