Merge branch 'char-misc-next' of... (af9ca4b0) · Commits · 戴 / test

.gitignore

+3 −0

Original line number	Diff line number	Diff line
		@@ -142,3 +142,6 @@ x509.genkey

		# Kdevelop4
		*.kdev4

		# Clang's compilation database file
		/compile_commands.json

.mailmap

+8 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,9 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
		Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>
		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
		Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
		Domen Puncer <domen@coderock.org>
		Douglas Gilbert <dougg@torque.net>
		Ed L. Cashin <ecashin@coraid.com>
		@@ -98,6 +101,7 @@ Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		Jean Tourrilhes <jt@hpl.hp.com>
		<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
		Jeff Garzik <jgarzik@pretzel.yyz.us>
		Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
		Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
		@@ -116,6 +120,7 @@ John Stultz <johnstul@us.ibm.com>
		Juha Yrjola <at solidboot.com>
		Juha Yrjola <juha.yrjola@nokia.com>
		Juha Yrjola <juha.yrjola@solidboot.com>
		Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
		Kay Sievers <kay.sievers@vrfy.org>
		Kenneth W Chen <kenneth.w.chen@intel.com>
		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
		@@ -132,6 +137,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
		Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
		Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
		Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
		Mark Brown <broonie@sirena.org.uk>
		Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
		@@ -157,6 +163,8 @@ Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.co
		Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
		Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
		Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
		Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
		Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
		Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <m@bues.ch>
		Michel Dänzer <michel@tungstengraphics.com>

Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc

+2 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,8 @@ Description: (RW) Configure MSC operating mode:
		- "single", for contiguous buffer mode (high-order alloc);
		- "multi", for multiblock mode;
		- "ExI", for DCI handler mode;
		- "debug", for debug mode.
		- "debug", for debug mode;
		- any of the currently loaded buffer sinks.
		If operating mode changes, existing buffer is deallocated,
		provided there are no active users and tracing is not enabled,
		otherwise the write will fail.

Documentation/ABI/testing/sysfs-class-mic.txt→Documentation/ABI/testing/sysfs-class-mic

+0 −0

File moved.

View file

Documentation/ABI/testing/sysfs-platform-dfl-fme

+23 −0

Original line number	Diff line number	Diff line
		@@ -21,3 +21,26 @@ Contact: Wu Hao <hao.wu@intel.com>
		Description: Read-only. It returns Bitstream (static FPGA region) meta
		data, which includes the synthesis date, seed and other
		information of this static FPGA region.

		What: /sys/bus/platform/devices/dfl-fme.0/cache_size
		Date: August 2019
		KernelVersion: 5.4
		Contact: Wu Hao <hao.wu@intel.com>
		Description: Read-only. It returns cache size of this FPGA device.

		What: /sys/bus/platform/devices/dfl-fme.0/fabric_version
		Date: August 2019
		KernelVersion: 5.4
		Contact: Wu Hao <hao.wu@intel.com>
		Description: Read-only. It returns fabric version of this FPGA device.
		Userspace applications need this information to select
		best data channels per different fabric design.

		What: /sys/bus/platform/devices/dfl-fme.0/socket_id
		Date: August 2019
		KernelVersion: 5.4
		Contact: Wu Hao <hao.wu@intel.com>
		Description: Read-only. It returns socket_id to indicate which socket
		this FPGA belongs to, only valid for integrated solution.
		User only needs this information, in case standard numa node
		can't provide correct information.

Admin message