Merge branch 'i2c/for-current' into i2c/for-5.11 (1e04538c) · Commits · 戴 / test

.mailmap

+7 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,10 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
		<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
		Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
		Dmitry Baryshkov <dbaryshkov@gmail.com>
		Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
		Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
		Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_eremin@mentor.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
		@@ -287,6 +290,7 @@ Santosh Shilimkar <ssantosh@kernel.org>
		Sarangdhar Joshi <spjoshi@codeaurora.org>
		Sascha Hauer <s.hauer@pengutronix.de>
		S.Çağlar Onur <caglar@pardus.org.tr>
		Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>
		Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
		Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
		Sebastian Reichel <sre@kernel.org> <sre@debian.org>
		@@ -318,6 +322,8 @@ TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
		Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
		Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
		Uwe Kleine-König <ukleinek@strlen.de>
		Uwe Kleine-König <ukl@pengutronix.de>
		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

CREDITS

+41 −26

Original line number	Diff line number	Diff line
		@@ -740,6 +740,11 @@ S: (ask for current address)
		S: Portland, Oregon
		S: USA

		N: Jason Cooper
		D: ARM/Marvell SOC co-maintainer
		D: irqchip co-maintainer
		D: MVEBU PCI DRIVER co-maintainer

		N: Robin Cornelius
		E: robincornelius@users.sourceforge.net
		D: Ralink rt2x00 WLAN driver
		@@ -849,6 +854,12 @@ D: trivial hack to add variable address length routing to Rose.
		D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO
		D: ax25-utils maintainer.

		N: Kamil Debski
		E: kamil@wypas.org
		D: Samsung S5P 2D graphics acceleration and Multi Format Codec drivers
		D: Samsung USB2 phy drivers
		D: PWM fan driver

		N: Helge Deller
		E: deller@gmx.de
		W: http://www.parisc-linux.org/
		@@ -2852,6 +2863,10 @@ D: IPX development and support
		N: Venkatesh Pallipadi (Venki)
		D: x86/HPET

		N: Kyungmin Park
		E: kyungmin.park@samsung.com
		D: Samsung S5Pv210 and Exynos4210 mobile platforms

		N: David Parsons
		E: orc@pell.chi.il.us
		D: improved memory detection code.

Documentation/ABI/stable/sysfs-driver-dma-ioatdma

+5 −5

Original line number	Diff line number	Diff line
		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap
		What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap
		Date: December 3, 2009
		KernelVersion: 2.6.32
		Contact: dmaengine@vger.kernel.org
		Description: Capabilities the DMA supports.Currently there are DMA_PQ, DMA_PQ_VAL,
		DMA_XOR,DMA_XOR_VAL,DMA_INTERRUPT.

		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active
		What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active
		Date: December 3, 2009
		KernelVersion: 2.6.32
		Contact: dmaengine@vger.kernel.org
		Description: The number of descriptors active in the ring.

		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size
		What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size
		Date: December 3, 2009
		KernelVersion: 2.6.32
		Contact: dmaengine@vger.kernel.org
		Description: Descriptor ring size, total number of descriptors available.

		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version
		What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version
		Date: December 3, 2009
		KernelVersion: 2.6.32
		Contact: dmaengine@vger.kernel.org
		Description: Version of ioatdma device.

		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce
		What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce
		Date: August 8, 2017
		KernelVersion: 4.14
		Contact: dmaengine@vger.kernel.org

Documentation/ABI/testing/sysfs-bus-iio-timer-stm32

+0 −24

Original line number	Diff line number	Diff line
		@@ -109,30 +109,6 @@ Description:
		When counting down the counter start from preset value
		and fire event when reach 0.

		What: /sys/bus/iio/devices/iio:deviceX/in_count_quadrature_mode_available
		KernelVersion: 4.12
		Contact: benjamin.gaignard@st.com
		Description:
		Reading returns the list possible quadrature modes.

		What: /sys/bus/iio/devices/iio:deviceX/in_count0_quadrature_mode
		KernelVersion: 4.12
		Contact: benjamin.gaignard@st.com
		Description:
		Configure the device counter quadrature modes:

		channel_A:
		Encoder A input servers as the count input and B as
		the UP/DOWN direction control input.

		channel_B:
		Encoder B input serves as the count input and A as
		the UP/DOWN direction control input.

		quadrature:
		Encoder A and B inputs are mixed to get direction
		and count with a scale of 0.25.

		What: /sys/bus/iio/devices/iio:deviceX/in_count_enable_mode_available
		KernelVersion: 4.12
		Contact: benjamin.gaignard@st.com

Documentation/ABI/testing/sysfs-class-net

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ Description:
		When an interface is under test, it cannot be expected
		to pass packets as normal.

		What: /sys/clas/net/<iface>/duplex
		What: /sys/class/net/<iface>/duplex
		Date: October 2009
		KernelVersion: 2.6.33
		Contact: netdev@vger.kernel.org

Admin message