Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (e63c1822) · Commits · git / linux-net

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -436,6 +436,7 @@ Muna Sinada <quic_msinada@quicinc.com> <msinada@codeaurora.org>
		Murali Nalajala <quic_mnalajal@quicinc.com> <mnalajal@codeaurora.org>
		Mythri P K <mythripk@ti.com>
		Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
		Naoya Horiguchi <naoya.horiguchi@nec.com> <n-horiguchi@ah.jp.nec.com>
		Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
		Neeraj Upadhyay <quic_neeraju@quicinc.com> <neeraju@codeaurora.org>
		Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -1855,6 +1855,10 @@ D: Fedora kernel maintenance (2003-2014).
		D: 'Trinity' and similar fuzz testing work.
		D: Misc/Other.

		N: Tom Joseph
		E: tjoseph@cadence.com
		D: Cadence PCIe driver

		N: Martin Josfsson
		E: gandalf@wlug.westbo.se
		P: 1024D/F6B6D3B1 7610 7CED 5C34 4AA6 DBA2 8BE1 5A6D AF95 F6B6 D3B1

Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml

+6 −4

Original line number	Diff line number	Diff line
		@@ -15,9 +15,11 @@ allOf:

		properties:
		compatible:
		enum:
		items:
		- enum:
		- fsl,imx23-ocotp
		- fsl,imx28-ocotp
		- const: fsl,ocotp

		reg:
		maxItems: 1
		@@ -35,7 +37,7 @@ unevaluatedProperties: false
		examples:
		- \|
		ocotp: efuse@8002c000 {
		compatible = "fsl,imx28-ocotp";
		compatible = "fsl,imx28-ocotp", "fsl,ocotp";
		#address-cells = <1>;
		#size-cells = <1>;
		reg = <0x8002c000 0x2000>;

Documentation/networking/ip-sysctl.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -2511,7 +2511,7 @@ temp_valid_lft - INTEGER
		temp_prefered_lft - INTEGER
		Preferred lifetime (in seconds) for temporary addresses. If
		temp_prefered_lft is less than the minimum required lifetime (typically
		5 seconds), the preferred lifetime is the minimum required. If
		5 seconds), temporary addresses will not be created. If
		temp_prefered_lft is greater than temp_valid_lft, the preferred lifetime
		is temp_valid_lft.

MAINTAINERS

+17 −9

Original line number	Diff line number	Diff line
		@@ -4127,7 +4127,6 @@ M: Franky Lin <franky.lin@broadcom.com>
		M: Hante Meuleman <hante.meuleman@broadcom.com>
		L: linux-wireless@vger.kernel.org
		L: brcm80211-dev-list.pdl@broadcom.com
		L: SHA-cyfmac-dev-list@infineon.com
		S: Supported
		F: drivers/net/wireless/broadcom/brcm80211/

		@@ -9008,12 +9007,9 @@ K: (devm_)?gpio_regmap_(un)?register
		GPIO SUBSYSTEM
		M: Linus Walleij <linus.walleij@linaro.org>
		M: Bartosz Golaszewski <brgl@bgdev.pl>
		R: Andy Shevchenko <andy@kernel.org>
		L: linux-gpio@vger.kernel.org
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
		F: Documentation/ABI/obsolete/sysfs-gpio
		F: Documentation/ABI/testing/gpio-cdev
		F: Documentation/admin-guide/gpio/
		F: Documentation/devicetree/bindings/gpio/
		F: Documentation/driver-api/gpio/
		@@ -9022,6 +9018,16 @@ F: include/dt-bindings/gpio/
		F: include/linux/gpio.h
		F: include/linux/gpio/
		F: include/linux/of_gpio.h

		GPIO UAPI
		M: Bartosz Golaszewski <brgl@bgdev.pl>
		R: Kent Gibson <warthog618@gmail.com>
		L: linux-gpio@vger.kernel.org
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
		F: Documentation/ABI/obsolete/sysfs-gpio
		F: Documentation/ABI/testing/gpio-cdev
		F: drivers/gpio/gpiolib-cdev.c
		F: include/uapi/linux/gpio.h
		F: tools/gpio/

		@@ -10642,6 +10648,7 @@ F: drivers/gpio/gpio-pch.c
		F: drivers/gpio/gpio-sch.c
		F: drivers/gpio/gpio-sodaville.c
		F: drivers/gpio/gpio-tangier.c
		F: drivers/gpio/gpio-tangier.h

		INTEL GVT-g DRIVERS (Intel GPU Virtualization)
		M: Zhenyu Wang <zhenyuw@linux.intel.com>
		@@ -11473,6 +11480,7 @@ F: scripts/vmlinux
		F: scripts/Kbuild*
		F: scripts/Makefile*
		F: scripts/basic/
		F: scripts/clang-tools/
		F: scripts/dummy-tools/
		F: scripts/mk*
		F: scripts/mod/
		@@ -12828,7 +12836,7 @@ S: Maintained
		F: drivers/net/ethernet/marvell/mvneta.*

		MARVELL MVPP2 ETHERNET DRIVER
		M: Marcin Wojtas <mw@semihalf.com>
		M: Marcin Wojtas <marcin.s.wojtas@gmail.com>
		M: Russell King <linux@armlinux.org.uk>
		L: netdev@vger.kernel.org
		S: Maintained
		@@ -15093,6 +15101,7 @@ K: \bmdo_
		NETWORKING [MPTCP]
		M: Matthieu Baerts <matttbe@kernel.org>
		M: Mat Martineau <martineau@kernel.org>
		R: Geliang Tang <geliang.tang@linux.dev>
		L: netdev@vger.kernel.org
		L: mptcp@lists.linux.dev
		S: Maintained
		@@ -15441,7 +15450,7 @@ F: Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml
		F: drivers/bluetooth/btnxpuart.c

		NXP C45 TJA11XX PHY DRIVER
		M: Radu Pirea <radu-nicolae.pirea@oss.nxp.com>
		M: Andrei Botila <andrei.botila@oss.nxp.com>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/phy/nxp-c45-tja11xx*
		@@ -16458,11 +16467,10 @@ F: Documentation/devicetree/bindings/pci/pci-armada8k.txt
		F: drivers/pci/controller/dwc/pcie-armada8k.c

		PCI DRIVER FOR CADENCE PCIE IP
		M: Tom Joseph <tjoseph@cadence.com>
		L: linux-pci@vger.kernel.org
		S: Maintained
		S: Orphan
		F: Documentation/devicetree/bindings/pci/cdns,*
		F: drivers/pci/controller/cadence/
		F: drivers/pci/controller/cadence/cadence

		PCI DRIVER FOR FREESCALE LAYERSCAPE
		M: Minghuan Lian <minghuan.Lian@nxp.com>