Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (13209a8f) · Commits · 戴 / test

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,8 @@ Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
		Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
		Will Deacon <will@kernel.org> <will.deacon@arm.com>
		Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
		Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
		Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
		Yusuke Goda <goda.yusuke@renesas.com>
		Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/devicetree/bindings/dma/fsl-edma.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,8 @@ Required properties:
		- compatible :
		- "fsl,vf610-edma" for eDMA used similar to that on Vybrid vf610 SoC
		- "fsl,imx7ulp-edma" for eDMA2 used similar to that on i.mx7ulp
		- "fsl,fsl,ls1028a-edma" for eDMA used similar to that on Vybrid vf610 SoC
		- "fsl,ls1028a-edma" followed by "fsl,vf610-edma" for eDMA used on the
		LS1028A SoC.
		- reg : Specifies base physical address(s) and size of the eDMA registers.
		The 1st region is eDMA control register's address and size.
		The 2nd and the 3rd regions are programmable channel multiplexing

Documentation/devicetree/bindings/net/dsa/b53.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,9 @@ Ethernet switch connected via MDIO to the host, CPU port wired to eth0:
		#size-cells = <0>;

		ports {
		#address-cells = <1>;
		#size-cells = <0>;

		port0@0 {
		reg = <0>;
		label = "lan1";

Documentation/usb/raw-gadget.rst

+30 −7

Original line number	Diff line number	Diff line
		@@ -27,9 +27,8 @@ differences are:
		3. Raw Gadget provides a way to select a UDC device/driver to bind to,
		while GadgetFS currently binds to the first available UDC.

		4. Raw Gadget uses predictable endpoint names (handles) across different
		UDCs (as long as UDCs have enough endpoints of each required transfer
		type).
		4. Raw Gadget explicitly exposes information about endpoints addresses and
		capabilities allowing a user to write UDC-agnostic gadgets.

		5. Raw Gadget has ioctl-based interface instead of a filesystem-based one.

		@@ -50,12 +49,36 @@ The typical usage of Raw Gadget looks like:
		Raw Gadget and react to those depending on what kind of USB device
		needs to be emulated.

		Note, that some UDC drivers have fixed addresses assigned to endpoints, and
		therefore arbitrary endpoint addresses can't be used in the descriptors.
		Nevertheles, Raw Gadget provides a UDC-agnostic way to write USB gadgets.
		Once a USB_RAW_EVENT_CONNECT event is received via USB_RAW_IOCTL_EVENT_FETCH,
		the USB_RAW_IOCTL_EPS_INFO ioctl can be used to find out information about
		endpoints that the UDC driver has. Based on that information, the user must
		chose UDC endpoints that will be used for the gadget being emulated, and
		properly assign addresses in endpoint descriptors.

		You can find usage examples (along with a test suite) here:

		https://github.com/xairy/raw-gadget

		Internal details
		~~~~~~~~~~~~~~~~

		Currently every endpoint read/write ioctl submits a USB request and waits until
		its completion. This is the desired mode for coverage-guided fuzzing (as we'd
		like all USB request processing happen during the lifetime of a syscall),
		and must be kept in the implementation. (This might be slow for real world
		applications, thus the O_NONBLOCK improvement suggestion below.)

		Potential future improvements
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

		- Implement ioctl's for setting/clearing halt status on endpoints.

		- Reporting more events (suspend, resume, etc.) through
		USB_RAW_IOCTL_EVENT_FETCH.
		- Report more events (suspend, resume, etc.) through USB_RAW_IOCTL_EVENT_FETCH.

		- Support O_NONBLOCK I/O.

		- Support USB 3 features (accept SS endpoint companion descriptor when
		enabling endpoints; allow providing stream_id for bulk transfers).

		- Support ISO transfer features (expose frame_number for completed requests).

MAINTAINERS

+16 −4

Original line number	Diff line number	Diff line
		@@ -5507,10 +5507,10 @@ F: drivers/gpu/drm/vboxvideo/

		DRM DRIVER FOR VMWARE VIRTUAL GPU
		M: "VMware Graphics" <linux-graphics-maintainer@vmware.com>
		M: Thomas Hellstrom <thellstrom@vmware.com>
		M: Roland Scheidegger <sroland@vmware.com>
		L: dri-devel@lists.freedesktop.org
		S: Supported
		T: git git://people.freedesktop.org/~thomash/linux
		T: git git://people.freedesktop.org/~sroland/linux
		F: drivers/gpu/drm/vmwgfx/
		F: include/uapi/drm/vmwgfx_drm.h

		@@ -7829,7 +7829,7 @@ T: git git://linuxtv.org/media_tree.git
		F: drivers/media/platform/sti/hva

		HWPOISON MEMORY FAILURE HANDLING
		M: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
		M: Naoya Horiguchi <naoya.horiguchi@nec.com>
		L: linux-mm@kvack.org
		S: Maintained
		F: mm/hwpoison-inject.c
		@@ -7941,7 +7941,7 @@ F: Documentation/i2c/busses/i2c-parport.rst
		F: drivers/i2c/busses/i2c-parport.c

		I2C SUBSYSTEM
		M: Wolfram Sang <wsa@the-dreams.de>
		M: Wolfram Sang <wsa@kernel.org>
		L: linux-i2c@vger.kernel.org
		S: Maintained
		W: https://i2c.wiki.kernel.org/
		@@ -9185,6 +9185,11 @@ L: kexec@lists.infradead.org
		S: Maintained
		W: http://lse.sourceforge.net/kdump/
		F: Documentation/admin-guide/kdump/
		F: fs/proc/vmcore.c
		F: include/linux/crash_core.h
		F: include/linux/crash_dump.h
		F: include/uapi/linux/vmcore.h
		F: kernel/crash_*.c

		KEENE FM RADIO TRANSMITTER DRIVER
		M: Hans Verkuil <hverkuil@xs4all.nl>
		@@ -10662,6 +10667,13 @@ L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/ethernet/mediatek/

		MEDIATEK I2C CONTROLLER DRIVER
		M: Qii Wang <qii.wang@mediatek.com>
		L: linux-i2c@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
		F: drivers/i2c/busses/i2c-mt65xx.c

		MEDIATEK JPEG DRIVER
		M: Rick Chang <rick.chang@mediatek.com>
		M: Bin Liu <bin.liu@mediatek.com>

Admin message