Unverified Commit 04cf420b authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

Merge drm/drm-next into drm-intel-next 



Need to take some Xe bo definition in here before
we can add the BMG display 64k aligned size restrictions.

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parents 67733d7a e55ef655

.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/accel/qaic/qaic.rst

+0 −6
Original line number Diff line number Diff line
@@ -147,12 +147,6 @@ DRM_IOCTL_QAIC_PERF_STATS_BO 
  recent execution of a BO. This allows userspace to construct an end to end

  timeline of the BO processing for a performance analysis.



DRM_IOCTL_QAIC_PART_DEV

  This IOCTL allows userspace to request a duplicate "shadow device". This extra

  accelN device is associated with a specific partition of resources on the

  AIC100 device and can be used for limiting a process to some subset of

  resources.



DRM_IOCTL_QAIC_DETACH_SLICE_BO

  This IOCTL allows userspace to remove the slicing information from a BO that

  was originally provided by a call to DRM_IOCTL_QAIC_ATTACH_SLICE_BO. This

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