Merge branch 'tip/perf/urgent'

Avoid conflicts, base on fixes.

Signed-off-by: Peter Zijlstra <[email protected]>

Author: Peter Zijlstra

.gitignore

@@ -74,7 +74,6 @@ modules.order
 #
 # RPM spec file (make rpm-pkg)
 #
-/kernel.spec
 /rpmbuild/
 
 #

.mailmap

@@ -87,13 +87,15 @@ Baolin Wang <[email protected]> <[email protected]>
 Baolin Wang <[email protected]> <[email protected]>
 Bart Van Assche <[email protected]> <[email protected]>
 Bart Van Assche <[email protected]> <[email protected]>
+Bartosz Golaszewski <[email protected]> <[email protected]>
 Ben Dooks <[email protected]> <[email protected]>
 Ben Dooks <[email protected]> <[email protected]>
 Ben Gardner <[email protected]>
 Ben M Cahill <[email protected]>
 Ben Widawsky <[email protected]> <[email protected]>
 Ben Widawsky <[email protected]> <[email protected]>
 Ben Widawsky <[email protected]> <[email protected]>
+Benjamin Poirier <[email protected]> <[email protected]>
 Bjorn Andersson <[email protected]> <[email protected]>
 Bjorn Andersson <[email protected]> <[email protected]>
 Bjorn Andersson <[email protected]> <[email protected]>
@@ -127,6 +129,7 @@ Christian Brauner <[email protected]> <[email protected]>
 Christian Marangi <[email protected]>
 Christophe Ricard <[email protected]>
 Christoph Hellwig <[email protected]>
+Claudiu Beznea <[email protected]> <[email protected]>
 Colin Ian King <[email protected]> <[email protected]>
 Corey Minyard <[email protected]>
 Damian Hobson-Garcia <[email protected]>
@@ -377,6 +380,7 @@ Matthew Wilcox <[email protected]> <[email protected]>
 Matthew Wilcox <[email protected]> <[email protected]>
 Matthew Wilcox <[email protected]> <[email protected]>
 Matthias Fuchs <[email protected]> <[email protected]>
+Matthieu Baerts <[email protected]> <[email protected]>
 Matthieu CASTET <[email protected]>
 Matti Vaittinen <[email protected]> <[email protected]>
 Matt Ranostay <[email protected]> <[email protected]>
@@ -449,9 +453,10 @@ Oleksandr Natalenko <[email protected]> <[email protected]>
 Oleksij Rempel <[email protected]> <[email protected]>
 Oleksij Rempel <[email protected]> <[email protected]>
 Oleksij Rempel <[email protected]> <[email protected]>
-Oleksij Rempel <[email protected]> <[email protected]>
-Oleksij Rempel <linux@rempel-privat.de> <[email protected]>
+Oleksij Rempel <[email protected]>
+Oleksij Rempel <o.rempel@pengutronix.de> <[email protected]>
 Oliver Upton <[email protected]> <[email protected]>
+Ondřej Jirman <[email protected]> <[email protected]>
 Oza Pawandeep <[email protected]> <[email protected]>
 Pali Rohár <[email protected]> <[email protected]>
 Paolo 'Blaisorblade' Giarrusso <[email protected]>
@@ -565,6 +570,7 @@ Takashi YOSHII <[email protected]>
 Tamizh Chelvam Raja <[email protected]> <[email protected]>
 Taniya Das <[email protected]> <[email protected]>
 Tejun Heo <[email protected]>
+Tomeu Vizoso <[email protected]> <[email protected]>
 Thomas Graf <[email protected]>
 Thomas Körper <[email protected]> <[email protected]>
 Thomas Pedersen <[email protected]>

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

@@ -270,6 +270,12 @@ Description:	Shows the operation capability bits displayed in bitmap format
 		correlates to the operations allowed. It's visible only
 		on platforms that support the capability.
 
+What:		/sys/bus/dsa/devices/wq<m>.<n>/driver_name
+Date:		Sept 8, 2023
+KernelVersion:	6.7.0
+Contact:	[email protected]
+Description:	Name of driver to be bounded to the wq.
+
 What:           /sys/bus/dsa/devices/engine<m>.<n>/group_id
 Date:           Oct 25, 2019
 KernelVersion:  5.6.0

Documentation/ABI/testing/configfs-tsm

@@ -0,0 +1,82 @@
+What:		/sys/kernel/config/tsm/report/$name/inblob
+Date:		September, 2023
+KernelVersion:	v6.7
+Contact:	[email protected]
+Description:
+		(WO) Up to 64 bytes of user specified binary data. For replay
+		protection this should include a nonce, but the kernel does not
+		place any restrictions on the content.
+
+What:		/sys/kernel/config/tsm/report/$name/outblob
+Date:		September, 2023
+KernelVersion:	v6.7
+Contact:	[email protected]
+Description:
+		(RO) Binary attestation report generated from @inblob and other
+		options The format of the report is implementation specific
+		where the implementation is conveyed via the @provider
+		attribute.
+
+What:		/sys/kernel/config/tsm/report/$name/auxblob
+Date:		October, 2023
+KernelVersion:	v6.7
+Contact:	[email protected]
+Description:
+		(RO) Optional supplemental data that a TSM may emit, visibility
+		of this attribute depends on TSM, and may be empty if no
+		auxiliary data is available.
+
+		When @provider is "sev_guest" this file contains the
+		"cert_table" from SEV-ES Guest-Hypervisor Communication Block
+		Standardization v2.03 Section 4.1.8.1 MSG_REPORT_REQ.
+		https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/specifications/56421.pdf
+
+What:		/sys/kernel/config/tsm/report/$name/provider
+Date:		September, 2023
+KernelVersion:	v6.7
+Contact:	[email protected]
+Description:
+		(RO) A name for the format-specification of @outblob like
+		"sev_guest" [1] or "tdx_guest" [2] in the near term, or a
+		common standard format in the future.
+
+		[1]: SEV Secure Nested Paging Firmware ABI Specification
+		Revision 1.55 Table 22
+		https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/specifications/56860.pdf
+
+		[2]: Intel® Trust Domain Extensions Data Center Attestation
+		Primitives : Quote Generation Library and Quote Verification
+		Library Revision 0.8 Appendix 4,5
+		https://download.01.org/intel-sgx/latest/dcap-latest/linux/docs/Intel_TDX_DCAP_Quoting_Library_API.pdf
+
+What:		/sys/kernel/config/tsm/report/$name/generation
+Date:		September, 2023
+KernelVersion:	v6.7
+Contact:	[email protected]
+Description:
+		(RO) The value in this attribute increments each time @inblob or
+		any option is written. Userspace can detect conflicts by
+		checking generation before writing to any attribute and making
+		sure the number of writes matches expectations after reading
+		@outblob, or it can prevent conflicts by creating a report
+		instance per requesting context.
+
+What:		/sys/kernel/config/tsm/report/$name/privlevel
+Date:		September, 2023
+KernelVersion:	v6.7
+Contact:	[email protected]
+Description:
+		(WO) Attribute is visible if a TSM implementation provider
+		supports the concept of attestation reports for TVMs running at
+		different privilege levels, like SEV-SNP "VMPL", specify the
+		privilege level via this attribute.  The minimum acceptable
+		value is conveyed via @privlevel_floor and the maximum
+		acceptable value is TSM_PRIVLEVEL_MAX (3).
+
+What:		/sys/kernel/config/tsm/report/$name/privlevel_floor
+Date:		September, 2023
+KernelVersion:	v6.7
+Contact:	[email protected]
+Description:
+		(RO) Indicates the minimum permissible value that can be written
+		to @privlevel.

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

@@ -35,4 +35,6 @@ Description:
 		req_number		the number of pre-allocated requests
 					for both capture and playback
 		function_name		name of the interface
+		c_terminal_type		code of the capture terminal type
+		p_terminal_type		code of the playback terminal type
 		=====================	=======================================