Commit fbb94408 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

Merge drm/drm-next into drm-xe-next 



Bring changes from drm-misc-next that got merged in drm-next back to
drm-xe so they can be used for additional features.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parents 0f688c0e 9ac4beb7

CREDITS

+13 −0
Original line number Diff line number Diff line
@@ -2161,6 +2161,19 @@ N: Mike Kravetz 
E: mike.kravetz@oracle.com

D: Maintenance and development of the hugetlb subsystem



N: Seth Jennings

E: sjenning@redhat.com

D: Creation and maintenance of zswap



N: Dan Streetman

E: ddstreet@ieee.org

D: Maintenance and development of zswap

D: Creation and maintenance of the zpool API



N: Vitaly Wool

E: vitaly.wool@konsulko.com

D: Maintenance and development of zswap



N: Andreas S. Krebs

E: akrebs@altavista.net

D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards

Documentation/ABI/testing/sysfs-class-net-queues

+11 −11
Original line number Diff line number Diff line 
What:		/sys/class/<iface>/queues/rx-<queue>/rps_cpus

What:		/sys/class/net/<iface>/queues/rx-<queue>/rps_cpus

Date:		March 2010

KernelVersion:	2.6.35

Contact:	netdev@vger.kernel.org
@@ -8,7 +8,7 @@ Description: 
		network device queue. Possible values depend on the number

		of available CPU(s) in the system.



What:		/sys/class/<iface>/queues/rx-<queue>/rps_flow_cnt

What:		/sys/class/net/<iface>/queues/rx-<queue>/rps_flow_cnt

Date:		April 2010

KernelVersion:	2.6.35

Contact:	netdev@vger.kernel.org
@@ -16,7 +16,7 @@ Description: 
		Number of Receive Packet Steering flows being currently

		processed by this particular network device receive queue.



What:		/sys/class/<iface>/queues/tx-<queue>/tx_timeout

What:		/sys/class/net/<iface>/queues/tx-<queue>/tx_timeout

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -24,7 +24,7 @@ Description: 
		Indicates the number of transmit timeout events seen by this

		network interface transmit queue.



What:		/sys/class/<iface>/queues/tx-<queue>/tx_maxrate

What:		/sys/class/net/<iface>/queues/tx-<queue>/tx_maxrate

Date:		March 2015

KernelVersion:	4.1

Contact:	netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description: 
		A Mbps max-rate set for the queue, a value of zero means disabled,

		default is disabled.



What:		/sys/class/<iface>/queues/tx-<queue>/xps_cpus

What:		/sys/class/net/<iface>/queues/tx-<queue>/xps_cpus

Date:		November 2010

KernelVersion:	2.6.38

Contact:	netdev@vger.kernel.org
@@ -42,7 +42,7 @@ Description: 
		network device transmit queue. Possible values depend on the

		number of available CPU(s) in the system.



What:		/sys/class/<iface>/queues/tx-<queue>/xps_rxqs

What:		/sys/class/net/<iface>/queues/tx-<queue>/xps_rxqs

Date:		June 2018

KernelVersion:	4.18.0

Contact:	netdev@vger.kernel.org
@@ -53,7 +53,7 @@ Description: 
		number of available receive queue(s) in the network device.

		Default is disabled.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -62,7 +62,7 @@ Description: 
		of this particular network device transmit queue.

		Default value is 1000.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/inflight

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/inflight

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -70,7 +70,7 @@ Description: 
		Indicates the number of bytes (objects) in flight on this

		network device transmit queue.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -79,7 +79,7 @@ Description: 
		on this network device transmit queue. This value is clamped

		to be within the bounds defined by limit_max and limit_min.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -88,7 +88,7 @@ Description: 
		queued on this network device transmit queue. See

		include/linux/dynamic_queue_limits.h for the default value.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org

Documentation/ABI/testing/sysfs-platform-silicom

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ What: /sys/devices/platform/silicom-platform/power_cycle 
Date:		November 2023

KernelVersion:	6.7

Contact:	Henry Shi <henrys@silicom-usa.com>

Description:

		This file allow user to power cycle the platform.

		Default value is 0; when set to 1, it powers down

		the platform, waits 5 seconds, then powers on the

Documentation/accel/introduction.rst

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ External References 
email threads

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



* `Initial discussion on the New subsystem for acceleration devices <https://lkml.org/lkml/2022/7/31/83>`_ - Oded Gabbay (2022)

* `patch-set to add the new subsystem <https://lkml.org/lkml/2022/10/22/544>`_ - Oded Gabbay (2022)

* `Initial discussion on the New subsystem for acceleration devices <https://lore.kernel.org/lkml/CAFCwf11=9qpNAepL7NL+YAV_QO=Wv6pnWPhKHKAepK3fNn+2Dg@mail.gmail.com/>`_ - Oded Gabbay (2022)

* `patch-set to add the new subsystem <https://lore.kernel.org/lkml/20221022214622.18042-1-ogabbay@kernel.org/>`_ - Oded Gabbay (2022)



Conference talks

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

Documentation/admin-guide/kernel-parameters.rst

+0 −5
Original line number Diff line number Diff line
@@ -218,8 +218,3 @@ bytes respectively. Such letter suffixes can also be entirely omitted: 


.. include:: kernel-parameters.txt

   :literal:
 


Todo

----



	Add more DRM drivers.