Commit 9758ff2f authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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



Backmerging for v5.16-rc5. Resolves a conflict between drm-misc-next
and drm-misc-fixes in the vc4 driver.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
parents 0b665d4a 244a36e5

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ 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>
@@ -123,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>

Documentation/admin-guide/blockdev/drbd/figures.rst

+2 −2
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ Sub graphs of DRBD's state transitions 
    :alt:   disk-states-8.dot

    :align: center



.. kernel-figure:: node-states-8.dot

    :alt:   node-states-8.dot

.. kernel-figure:: peer-states-8.dot

    :alt:   peer-states-8.dot

    :align: center

Documentation/admin-guide/blockdev/drbd/node-states-8.dot→Documentation/admin-guide/blockdev/drbd/peer-states-8.dot

+0 −5
Original line number Diff line number Diff line 
digraph node_states {

	Secondary -> Primary           [ label = "ioctl_set_state()" ]

	Primary   -> Secondary 	       [ label = "ioctl_set_state()" ]

}



digraph peer_states {

	Secondary -> Primary           [ label = "recv state packet" ]

	Primary   -> Secondary 	       [ label = "recv state packet" ]

Documentation/admin-guide/laptops/thinkpad-acpi.rst

+6 −6
Original line number Diff line number Diff line
@@ -1520,15 +1520,15 @@ This sysfs attribute controls the keyboard "face" that will be shown on the 
Lenovo X1 Carbon 2nd gen (2014)'s adaptive keyboard. The value can be read

and set.



- 1 = Home mode

- 2 = Web-browser mode

- 3 = Web-conference mode

- 4 = Function mode

- 5 = Layflat mode

- 0 = Home mode

- 1 = Web-browser mode

- 2 = Web-conference mode

- 3 = Function mode

- 4 = Layflat mode



For more details about which buttons will appear depending on the mode, please

review the laptop's user guide:

http://www.lenovo.com/shop/americas/content/user_guides/x1carbon_2_ug_en.pdf

https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles_pdf/x1carbon_2_ug_en.pdf



Battery charge control

----------------------

Documentation/admin-guide/sysctl/kernel.rst

+1 −1
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ task_delayacct 
===============



Enables/disables task delay accounting (see

:doc:`accounting/delay-accounting.rst`). Enabling this feature incurs

Documentation/accounting/delay-accounting.rst. Enabling this feature incurs

a small amount of overhead in the scheduler but is useful for debugging

and performance tuning. It is required by some tools such as iotop.