Commit 3973a8d0 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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



Backmerging to get fixes from v6.11-rc5.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
parents e75356ef 6d0ebb39

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com> 
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>

David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>

David Heidelberg <david@ixit.cz> <d.okias@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>

David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>

Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu

+3 −3
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ Description: (RW) The front button on the Turris Omnia router can be 
		interrupt.



		This file switches between these two modes:

		- "mcu" makes the button press event be handled by the MCU to

		 - ``mcu`` makes the button press event be handled by the MCU to

		   change the LEDs panel intensity.

		- "cpu" makes the button press event be handled by the CPU.

		 - ``cpu`` makes the button press event be handled by the CPU.



		Format: %s.

Documentation/ABI/testing/sysfs-devices-system-cpu

+2 −1
Original line number Diff line number Diff line
@@ -562,7 +562,8 @@ Description: Control Symmetric Multi Threading (SMT) 
			 ================ =========================================



			 If control status is "forceoff" or "notsupported" writes

			 are rejected.

			 are rejected. Note that enabling SMT on PowerPC skips

			 offline cores.



What:		/sys/devices/system/cpu/cpuX/power/energy_perf_bias

Date:		March 2019

Documentation/admin-guide/cifs/usage.rst

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ SecurityFlags Flags which control security negotiation and 
			  may use NTLMSSP               		0x00080

			  must use NTLMSSP           			0x80080

			  seal (packet encryption)			0x00040

			  must seal (not implemented yet)               0x40040

			  must seal                                     0x40040



cifsFYI			If set to non-zero value, additional debug information

			will be logged to the system error log.  This field

Documentation/admin-guide/device-mapper/dm-crypt.rst

+8 −7
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ iv_large_sectors 




Module parameters::



   max_read_size

   max_write_size

      Maximum size of read or write requests. When a request larger than this size