Unverified Commit 355b6029 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

Merge drm/drm-next into drm-misc-next



Christian needs some patches from drm/next

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
parents 91185d55 a1a1ca70
Loading
Loading
Loading
Loading
+10 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ Andrew Morton <akpm@linux-foundation.org>
Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>
Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>
Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>
Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>
Andrew Vasquez <andrew.vasquez@qlogic.com>
Andrew Vasquez <andrew.vasquez@qlogic.com>
Andrey Konovalov <andreyknvl@gmail.com> <andreyknvl@google.com>
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>
Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>
Andy Adamson <andros@citi.umich.edu>
Andy Adamson <andros@citi.umich.edu>
@@ -65,6 +66,8 @@ Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
Christophe Ricard <christophe.ricard@gmail.com>
Christophe Ricard <christophe.ricard@gmail.com>
Christoph Hellwig <hch@lst.de>
Christoph Hellwig <hch@lst.de>
Corey Minyard <minyard@acm.org>
Corey Minyard <minyard@acm.org>
@@ -165,6 +168,7 @@ Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
John Stultz <johnstul@us.ibm.com>
John Stultz <johnstul@us.ibm.com>
Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
<josh@joshtriplett.org> <josh@freedesktop.org>
<josh@joshtriplett.org> <josh@freedesktop.org>
<josh@joshtriplett.org> <josh@kernel.org>
<josh@joshtriplett.org> <josh@kernel.org>
<josh@joshtriplett.org> <josht@linux.vnet.ibm.com>
<josh@joshtriplett.org> <josht@linux.vnet.ibm.com>
@@ -250,8 +254,14 @@ Morten Welinder <welinder@anemone.rentec.com>
Morten Welinder <welinder@darter.rentec.com>
Morten Welinder <welinder@darter.rentec.com>
Morten Welinder <welinder@troll.com>
Morten Welinder <welinder@troll.com>
Mythri P K <mythripk@ti.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>
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
Nguyen Anh Quynh <aquynh@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 Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
+2 −2
Original line number Original line Diff line number Diff line
What:		/sys/kernel/debug/moxtet/input
What:		/sys/kernel/debug/moxtet/input
Date:		March 2019
Date:		March 2019
KernelVersion:	5.3
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.
Description:	(Read) Read input from the shift registers, in hexadecimal.
		Returns N+1 bytes, where N is the number of Moxtet connected
		Returns N+1 bytes, where N is the number of Moxtet connected
		modules. The first byte is from the CPU board itself.
		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
What:		/sys/kernel/debug/moxtet/output
Date:		March 2019
Date:		March 2019
KernelVersion:	5.3
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
Description:	(RW) Read last written value to the shift registers, in
		hexadecimal, or write values to the shift registers, also
		hexadecimal, or write values to the shift registers, also
		in hexadecimal.
		in hexadecimal.
+1 −1
Original line number Original line Diff line number Diff line
What:		/sys/kernel/debug/turris-mox-rwtm/do_sign
What:		/sys/kernel/debug/turris-mox-rwtm/do_sign
Date:		Jun 2020
Date:		Jun 2020
KernelVersion:	5.8
KernelVersion:	5.8
Contact:	Marek Behún <marek.behun@nic.cz>
Contact:	Marek Behún <kabel@kernel.org>
Description:
Description:


		======= ===========================================================
		======= ===========================================================
+3 −3
Original line number Original line Diff line number Diff line
What:		/sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_description
What:		/sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_description
Date:		March 2019
Date:		March 2019
KernelVersion:	5.3
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
Description:	(Read) Moxtet module description. Format: string


What:		/sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_id
What:		/sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_id
Date:		March 2019
Date:		March 2019
KernelVersion:	5.3
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
Description:	(Read) Moxtet module ID. Format: %x


What:		/sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_name
What:		/sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_name
Date:		March 2019
Date:		March 2019
KernelVersion:	5.3
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
Description:	(Read) Moxtet module name. Format: string
+1 −1
Original line number Original line Diff line number Diff line
What:		/sys/class/leds/<led>/device/brightness
What:		/sys/class/leds/<led>/device/brightness
Date:		July 2020
Date:		July 2020
KernelVersion:	5.9
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
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
		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.
		LEDs at once, so that if they are too bright, user can dim them.
Loading