Commit 17580470 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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



Backmerging to bring drm-misc-next-fixes up to the latest state for
the current release cycle.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
parents bcae3af2 1c405ca1

.mailmap

+11 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ Al Viro <viro@zenIV.linux.org.uk> 
Andi Kleen <ak@linux.intel.com> <ak@suse.de>

Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>

Andreas Herrmann <aherrman@de.ibm.com>

Andrej Shadura <andrew.shadura@collabora.co.uk>

Andrej Shadura <andrew@shadura.me> <andrew@beldisplaytech.com>

Andrew Morton <akpm@linux-foundation.org>

Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>

Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>
@@ -69,8 +71,13 @@ Chao Yu <chao@kernel.org> <chao2.yu@samsung.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>

Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>

Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>

Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>

Colin Ian King <colin.king@intel.com> <colin.i.king@gmail.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
@@ -98,6 +105,7 @@ Douglas Gilbert <dougg@torque.net> 
Ed L. Cashin <ecashin@coraid.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>

Felipe W Damasio <felipewd@terra.com.br>

Felix Kuhling <fxkuehl@gmx.de>

Felix Moeller <felix@derklecks.de>
@@ -118,6 +126,8 @@ Greg Kroah-Hartman <gregkh@suse.de> 
Greg Kroah-Hartman <greg@kroah.com>

Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>

Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>

Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>

Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
@@ -276,6 +286,7 @@ Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org> 
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>

Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>

Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>

Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>

CREDITS

+1 −0
Original line number Diff line number Diff line
@@ -971,6 +971,7 @@ D: PowerPC 
N: Daniel Drake

E: dsd@gentoo.org

D: USBAT02 CompactFlash support in usb-storage

D: ZD1211RW wireless driver

S: UK



N: Oleg Drokin

Documentation/ABI/obsolete/o2cb

0 → 100644
+11 −0
Original line number Diff line number Diff line 
What:		/sys/o2cb

Date:		Dec 2005

KernelVersion:	2.6.16

Contact:	ocfs2-devel@oss.oracle.com

Description:	Ocfs2-tools looks at 'interface-revision' for versioning

		information. Each logmask/ file controls a set of debug prints

		and can be written into with the strings "allow", "deny", or

		"off". Reading the file returns the current state.

		Was renamed to /sys/fs/u2cb/

Users:		ocfs2-tools. It's sufficient to mail proposed changes to

		ocfs2-devel@oss.oracle.com.

Documentation/ABI/obsolete/sysfs-bus-iio

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Description: 


		Since Kernel 5.11, multiple buffers are supported.

		so, it is better to use, instead:



			/sys/bus/iio/devices/iio:deviceX/bufferY/length



What:		/sys/bus/iio/devices/iio:deviceX/buffer/enable
@@ -17,6 +18,7 @@ Description: 


		Since Kernel 5.11, multiple buffers are supported.

		so, it is better to use, instead:



			/sys/bus/iio/devices/iio:deviceX/bufferY/enable



What:		/sys/bus/iio/devices/iio:deviceX/scan_elements
@@ -165,6 +167,7 @@ Description: 


		Since Kernel 5.11, multiple buffers are supported.

		so, it is better to use, instead:



			/sys/bus/iio/devices/iio:deviceX/bufferY/watermark



What:		/sys/bus/iio/devices/iio:deviceX/buffer/data_available
@@ -179,4 +182,5 @@ Description: 


		Since Kernel 5.11, multiple buffers are supported.

		so, it is better to use, instead:



			/sys/bus/iio/devices/iio:deviceX/bufferY/data_available

Documentation/ABI/stable/o2cb

+1 −1
Original line number Diff line number Diff line 
What:		/sys/fs/o2cb/ (was /sys/o2cb)

What:		/sys/fs/o2cb/

Date:		Dec 2005

KernelVersion:	2.6.16

Contact:	ocfs2-devel@oss.oracle.com