Merge USB 4.20-rc8 mergepoint into usb-next (cd6a2231) · Commits · 戴 / test

CREDITS

+8 −0

Original line number	Diff line number	Diff line
		@@ -2541,6 +2541,10 @@ S: Ormond
		S: Victoria 3163
		S: Australia

		N: Eric Miao
		E: eric.y.miao@gmail.com
		D: MMP support

		N: Pauline Middelink
		E: middelin@polyware.nl
		D: General low-level bug fixes, /proc fixes, identd support
		@@ -4115,6 +4119,10 @@ S: 1507 145th Place SE #B5
		S: Bellevue, Washington 98007
		S: USA

		N: Haojian Zhuang
		E: haojian.zhuang@gmail.com
		D: MMP support

		N: Richard Zidlicky
		E: rz@linux-m68k.org, rdzidlic@geocities.com
		W: http://www.geocities.com/rdzidlic

Documentation/core-api/xarray.rst

+4 −1

Original line number	Diff line number	Diff line
		@@ -187,6 +187,8 @@ Takes xa_lock internally:
		* :c:func:`xa_erase_bh`
		* :c:func:`xa_erase_irq`
		* :c:func:`xa_cmpxchg`
		* :c:func:`xa_cmpxchg_bh`
		* :c:func:`xa_cmpxchg_irq`
		* :c:func:`xa_store_range`
		* :c:func:`xa_alloc`
		* :c:func:`xa_alloc_bh`
		@@ -263,7 +265,8 @@ using :c:func:`xa_lock_irqsave` in both the interrupt handler and process
		context, or :c:func:`xa_lock_irq` in process context and :c:func:`xa_lock`
		in the interrupt handler. Some of the more common patterns have helper
		functions such as :c:func:`xa_store_bh`, :c:func:`xa_store_irq`,
		:c:func:`xa_erase_bh` and :c:func:`xa_erase_irq`.
		:c:func:`xa_erase_bh`, :c:func:`xa_erase_irq`, :c:func:`xa_cmpxchg_bh`
		and :c:func:`xa_cmpxchg_irq`.

		Sometimes you need to protect access to the XArray with a mutex because
		that lock sits above another mutex in the locking hierarchy. That does

Documentation/media/uapi/v4l/extended-controls.rst

+10 −0

Original line number	Diff line number	Diff line
		@@ -1505,6 +1505,11 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -
		configuring a stateless hardware decoding pipeline for MPEG-2.
		The bitstream parameters are defined according to :ref:`mpeg2part2`.

		.. note::

		This compound control is not yet part of the public kernel API and
		it is expected to change.

		.. c:type:: v4l2_ctrl_mpeg2_slice_params

		.. cssclass:: longtable
		@@ -1625,6 +1630,11 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -
		Specifies quantization matrices (as extracted from the bitstream) for the
		associated MPEG-2 slice data.

		.. note::

		This compound control is not yet part of the public kernel API and
		it is expected to change.

		.. c:type:: v4l2_ctrl_mpeg2_quantization

		.. cssclass:: longtable

MAINTAINERS

+16 −7

Original line number	Diff line number	Diff line
		@@ -1739,13 +1739,17 @@ ARM/Mediatek SoC support
		M: Matthias Brugger <matthias.bgg@gmail.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		L: linux-mediatek@lists.infradead.org (moderated for non-subscribers)
		W: https://mtk.bcnfs.org/
		C: irc://chat.freenode.net/linux-mediatek
		S: Maintained
		F: arch/arm/boot/dts/mt6*
		F: arch/arm/boot/dts/mt7*
		F: arch/arm/boot/dts/mt8*
		F: arch/arm/mach-mediatek/
		F: arch/arm64/boot/dts/mediatek/
		F: drivers/soc/mediatek/
		N: mtk
		N: mt[678]
		K: mediatek

		ARM/Mediatek USB3 PHY DRIVER
		@@ -4843,6 +4847,7 @@ F: include/uapi/drm/vmwgfx_drm.h

		DRM DRIVERS
		M: David Airlie <airlied@linux.ie>
		M: Daniel Vetter <daniel@ffwll.ch>
		L: dri-devel@lists.freedesktop.org
		T: git git://anongit.freedesktop.org/drm/drm
		B: https://bugs.freedesktop.org/
		@@ -8939,7 +8944,7 @@ F: arch/mips/boot/dts/img/pistachio_marduk.dts

		MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
		M: Andrew Lunn <andrew@lunn.ch>
		M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
		M: Vivien Didelot <vivien.didelot@gmail.com>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/dsa/mv88e6xxx/
		@@ -9444,6 +9449,13 @@ F: drivers/media/platform/mtk-vpu/
		F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt
		F: Documentation/devicetree/bindings/media/mediatek-vpu.txt

		MEDIATEK MT76 WIRELESS LAN DRIVER
		M: Felix Fietkau <nbd@nbd.name>
		M: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
		L: linux-wireless@vger.kernel.org
		S: Maintained
		F: drivers/net/wireless/mediatek/mt76/

		MEDIATEK MT7601U WIRELESS LAN DRIVER
		M: Jakub Kicinski <kubakici@wp.pl>
		L: linux-wireless@vger.kernel.org
		@@ -10006,12 +10018,9 @@ S: Odd Fixes
		F: drivers/media/radio/radio-miropcm20*

		MMP SUPPORT
		M: Eric Miao <eric.y.miao@gmail.com>
		M: Haojian Zhuang <haojian.zhuang@gmail.com>
		R: Lubomir Rintel <lkundrak@v3.sk>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		T: git git://github.com/hzhuang1/linux.git
		T: git git://git.linaro.org/people/ycmiao/pxa-linux.git
		S: Maintained
		S: Odd Fixes
		F: arch/arm/boot/dts/mmp*
		F: arch/arm/mach-mmp/

		@@ -10417,7 +10426,7 @@ F: drivers/net/wireless/

		NETWORKING [DSA]
		M: Andrew Lunn <andrew@lunn.ch>
		M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
		M: Vivien Didelot <vivien.didelot@gmail.com>
		M: Florian Fainelli <f.fainelli@gmail.com>
		S: Maintained
		F: Documentation/devicetree/bindings/net/dsa/

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		VERSION = 4
		PATCHLEVEL = 20
		SUBLEVEL = 0
		EXTRAVERSION = -rc6
		EXTRAVERSION = -rc7
		NAME = Shy Crocodile

		# DOCUMENTATION

Admin message