Commit 14d34d2d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.12-rc7 into usb-next



We need the USB fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 3db53374 d434405a
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
John Stultz <johnstul@us.ibm.com>
Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
<josh@joshtriplett.org> <josh@freedesktop.org>
<josh@joshtriplett.org> <josh@kernel.org>
<josh@joshtriplett.org> <josht@linux.vnet.ibm.com>
@@ -253,8 +254,14 @@ Morten Welinder <welinder@anemone.rentec.com>
Morten Welinder <welinder@darter.rentec.com>
Morten Welinder <welinder@troll.com>
Mythri P K <mythripk@ti.com>
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
Nguyen Anh Quynh <aquynh@gmail.com>
Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>
Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>
Nicholas Piggin <npiggin@gmail.com> <npiggin@suse.de>
Nicholas Piggin <npiggin@gmail.com> <nickpiggin@yahoo.com.au>
Nicholas Piggin <npiggin@gmail.com> <piggin@cyberone.com.au>
Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
+2 −2
Original line number Diff line number Diff line
What:		/sys/kernel/debug/moxtet/input
Date:		March 2019
KernelVersion:	5.3
Contact:	Marek Behún <marek.behun@nic.cz>
Contact:	Marek Behún <kabel@kernel.org>
Description:	(Read) Read input from the shift registers, in hexadecimal.
		Returns N+1 bytes, where N is the number of Moxtet connected
		modules. The first byte is from the CPU board itself.
@@ -19,7 +19,7 @@ Description: (Read) Read input from the shift registers, in hexadecimal.
What:		/sys/kernel/debug/moxtet/output
Date:		March 2019
KernelVersion:	5.3
Contact:	Marek Behún <marek.behun@nic.cz>
Contact:	Marek Behún <kabel@kernel.org>
Description:	(RW) Read last written value to the shift registers, in
		hexadecimal, or write values to the shift registers, also
		in hexadecimal.
+1 −1
Original line number Diff line number Diff line
What:		/sys/kernel/debug/turris-mox-rwtm/do_sign
Date:		Jun 2020
KernelVersion:	5.8
Contact:	Marek Behún <marek.behun@nic.cz>
Contact:	Marek Behún <kabel@kernel.org>
Description:

		======= ===========================================================
+3 −3
Original line number Diff line number Diff line
What:		/sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_description
Date:		March 2019
KernelVersion:	5.3
Contact:	Marek Behún <marek.behun@nic.cz>
Contact:	Marek Behún <kabel@kernel.org>
Description:	(Read) Moxtet module description. Format: string

What:		/sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_id
Date:		March 2019
KernelVersion:	5.3
Contact:	Marek Behún <marek.behun@nic.cz>
Contact:	Marek Behún <kabel@kernel.org>
Description:	(Read) Moxtet module ID. Format: %x

What:		/sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_name
Date:		March 2019
KernelVersion:	5.3
Contact:	Marek Behún <marek.behun@nic.cz>
Contact:	Marek Behún <kabel@kernel.org>
Description:	(Read) Moxtet module name. Format: string
+1 −1
Original line number Diff line number Diff line
What:		/sys/class/leds/<led>/device/brightness
Date:		July 2020
KernelVersion:	5.9
Contact:	Marek Behún <marek.behun@nic.cz>
Contact:	Marek Behún <kabel@kernel.org>
Description:	(RW) On the front panel of the Turris Omnia router there is also
		a button which can be used to control the intensity of all the
		LEDs at once, so that if they are too bright, user can dim them.
Loading