Commit e80b5003 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.5/apple' into for-linus 

- improved support for Keychron K8 keyboard (Lasse Brun)
parents 177d591a 72e49cad

.clang-format

+0 −1
Original line number Diff line number Diff line
@@ -521,7 +521,6 @@ ForEachMacros: 
  - 'of_property_for_each_u32'

  - 'pci_bus_for_each_resource'

  - 'pci_dev_for_each_resource'

  - 'pci_doe_for_each_off'

  - 'pcl_for_each_chunk'

  - 'pcl_for_each_segment'

  - 'pcm_for_each_format'

.mailmap

+13 −1
Original line number Diff line number Diff line
@@ -213,7 +213,10 @@ Jeff Garzik <jgarzik@pretzel.yyz.us> 
Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>

Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>

Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>

Jens Axboe <axboe@suse.de>

Jens Axboe <axboe@kernel.dk> <axboe@suse.de>

Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>

Jens Axboe <axboe@kernel.dk> <axboe@fb.com>

Jens Axboe <axboe@kernel.dk> <axboe@meta.com>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>

Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
@@ -328,6 +331,7 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com> 
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>

Michel Dänzer <michel@tungstengraphics.com>

Michel Lespinasse <michel@lespinasse.org>

Michel Lespinasse <michel@lespinasse.org> <walken@google.com>
@@ -360,6 +364,12 @@ 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>

Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>

Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>

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>
@@ -375,6 +385,8 @@ Paul E. McKenney <paulmck@kernel.org> <paul.mckenney@linaro.org> 
Paul E. McKenney <paulmck@kernel.org> <paulmck@linux.ibm.com>

Paul E. McKenney <paulmck@kernel.org> <paulmck@linux.vnet.ibm.com>

Paul E. McKenney <paulmck@kernel.org> <paulmck@us.ibm.com>

Paul Mackerras <paulus@ozlabs.org> <paulus@samba.org>

Paul Mackerras <paulus@ozlabs.org> <paulus@au1.ibm.com>

Peter A Jonsson <pj@ludd.ltu.se>

Peter Oruba <peter.oruba@amd.com>

Peter Oruba <peter@oruba.de>

CREDITS

+11 −2
Original line number Diff line number Diff line
@@ -1706,6 +1706,10 @@ S: Panoramastrasse 18 
S: D-69126 Heidelberg

S: Germany



N: Neil Horman

M: nhorman@tuxdriver.com

D: SCTP protocol maintainer.



N: Simon Horman

M: horms@verge.net.au

D: Renesas ARM/ARM64 SoC maintainer
@@ -2510,8 +2514,8 @@ D: XF86_8514 
D: cfdisk (curses based disk partitioning program)



N: Mat Martineau

E: mat@martineau.name

D: MPTCP subsystem co-maintainer 2020-2023

E: martineau@kernel.org

D: MPTCP subsystem co-maintainer

D: Keyctl restricted keyring and Diffie-Hellman UAPI

D: Bluetooth L2CAP ERTM mode and AMP

S: USA
@@ -3475,6 +3479,11 @@ D: several improvements to system programs 
S: Oldenburg

S: Germany



N: Mathieu Poirier

E: mathieu.poirier@linaro.org

D: CoreSight kernel subsystem, Maintainer 2014-2022

D: Perf tool support for CoreSight



N: Robert Schwebel

E: robert@schwebel.de

W: https://www.schwebel.de

Documentation/ABI/stable/sysfs-driver-dma-idxd

+51 −0
Original line number Diff line number Diff line
@@ -136,6 +136,22 @@ Description: The last executed device administrative command's status/error. 
		Also last configuration error overloaded.

		Writing to it will clear the status.



What:		/sys/bus/dsa/devices/dsa<m>/iaa_cap

Date:		Sept 14, 2022

KernelVersion: 6.0.0

Contact:	dmaengine@vger.kernel.org

Description:	IAA (IAX) capability mask. Exported to user space for application

		consumption. This attribute should only be visible on IAA devices

		that are version 2 or later.



What:		/sys/bus/dsa/devices/dsa<m>/event_log_size

Date:		Sept 14, 2022

KernelVersion: 6.4.0

Contact:	dmaengine@vger.kernel.org

Description:	The event log size to be configured. Default is 64 entries and

		occupies 4k size if the evl entry is 64 bytes. It's visible

		only on platforms that support the capability.



What:		/sys/bus/dsa/devices/wq<m>.<n>/block_on_fault

Date:		Oct 27, 2020

KernelVersion:	5.11.0
@@ -219,6 +235,16 @@ Contact: dmaengine@vger.kernel.org 
Description:	Indicate whether ATS disable is turned on for the workqueue.

		0 indicates ATS is on, and 1 indicates ATS is off for the workqueue.



What:		/sys/bus/dsa/devices/wq<m>.<n>/prs_disable

Date:		Sept 14, 2022

KernelVersion: 6.4.0

Contact:	dmaengine@vger.kernel.org

Description:	Controls whether PRS disable is turned on for the workqueue.

		0 indicates PRS is on, and 1 indicates PRS is off for the

		workqueue. This option overrides block_on_fault attribute

		if set. It's visible only on platforms that support the

		capability.



What:		/sys/bus/dsa/devices/wq<m>.<n>/occupancy

Date		May 25, 2021

KernelVersion:	5.14.0
@@ -302,3 +328,28 @@ Description: Allows control of the number of batch descriptors that can be 
		1 (1/2 of max value), 2 (1/4 of the max value), and 3 (1/8 of

		the max value). It's visible only on platforms that support

		the capability.



What:		/sys/bus/dsa/devices/wq<m>.<n>/dsa<x>\!wq<m>.<n>/file<y>/cr_faults

Date:		Sept 14, 2022

KernelVersion:	6.4.0

Contact:	dmaengine@vger.kernel.org

Description:	Show the number of Completion Record (CR) faults this application

		has caused.



What:		/sys/bus/dsa/devices/wq<m>.<n>/dsa<x>\!wq<m>.<n>/file<y>/cr_fault_failures

Date:		Sept 14, 2022

KernelVersion:	6.4.0

Contact:	dmaengine@vger.kernel.org

Description:	Show the number of Completion Record (CR) faults failures that this

		application has caused. The failure counter is incremented when the

		driver cannot fault in the address for the CR. Typically this is caused

		by a bad address programmed in the submitted descriptor or a malicious

		submitter is using bad CR address on purpose.



What:		/sys/bus/dsa/devices/wq<m>.<n>/dsa<x>\!wq<m>.<n>/file<y>/pid

Date:		Sept 14, 2022

KernelVersion:	6.4.0

Contact:	dmaengine@vger.kernel.org

Description:	Show the process id of the application that opened the file. This is

		helpful information for a monitor daemon that wants to kill the

		application that opened the file.

Documentation/ABI/testing/configfs-usb-gadget-uvc

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ Date: Dec 2014 
KernelVersion:	4.0

Description:	Default camera terminal descriptors



		All attributes read only:

		All attributes read only except bmControls, which is read/write:



		========================  ====================================

		bmControls		  bitmap specifying which controls are
@@ -101,7 +101,7 @@ Date: Dec 2014 
KernelVersion:	4.0

Description:	Default processing unit descriptors



		All attributes read only:

		All attributes read only except bmControls, which is read/write:



		===============	========================================

		iProcessing	index of string descriptor