Merge tag 'v6.16' into x86/cpu, to resolve conflict

Resolve overlapping context conflict between this upstream fix:

  d8010d4 ("x86/bugs: Add a Transient Scheduler Attacks mitigation")

And this pending commit in tip:x86/cpu:

  65f55a3 ("x86/CPU/AMD: Add CPUID faulting support")

  Conflicts:
	arch/x86/kernel/cpu/amd.c

Signed-off-by: Ingo Molnar <[email protected]>

Author: Ingo Molnar

.mailmap

@@ -197,6 +197,7 @@ Daniel Borkmann <[email protected]> <[email protected]>
 Daniel Borkmann <[email protected]> <[email protected]>
 Daniel Borkmann <[email protected]> <[email protected]>
 Daniel Borkmann <[email protected]> <[email protected]>
+Danilo Krummrich <[email protected]> <[email protected]>
 David Brownell <[email protected]>
 David Collins <[email protected]> <[email protected]>
 David Heidelberg <[email protected]> <[email protected]>
@@ -222,6 +223,8 @@ Dmitry Safonov <[email protected]> <[email protected]>
 Dmitry Safonov <[email protected]> <[email protected]>
 Domen Puncer <[email protected]>
 Douglas Gilbert <[email protected]>
+Drew Fustini <[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
 Ed L. Cashin <[email protected]>
 Elliot Berman <[email protected]> <[email protected]>
 Enric Balletbo i Serra <[email protected]> <[email protected]>
@@ -282,6 +285,7 @@ Gustavo Padovan <[email protected]>
 Gustavo Padovan <[email protected]>
 Hamza Mahfooz <[email protected]> <[email protected]>
 Hanjun Guo <[email protected]> <[email protected]>
+Hans de Goede <[email protected]> <[email protected]>
 Hans Verkuil <[email protected]> <[email protected]>
 Hans Verkuil <[email protected]> <[email protected]>
 Harry Yoo <[email protected]> <[email protected]>
@@ -412,6 +416,7 @@ Kenneth W Chen <[email protected]>
 Kenneth Westfield <[email protected]> <[email protected]>
 Kiran Gunda <[email protected]> <[email protected]>
 Kirill Tkhai <[email protected]> <[email protected]>
+Kirill A. Shutemov <[email protected]> <[email protected]>
 Kishon Vijay Abraham I <[email protected]> <[email protected]>
 Konrad Dybcio <[email protected]> <[email protected]>
 Konrad Dybcio <[email protected]> <[email protected]>
@@ -689,11 +694,16 @@ Sedat Dilek <[email protected]> <[email protected]>
 Senthilkumar N L <[email protected]> <[email protected]>
 Serge Hallyn <[email protected]> <[email protected]>
 Serge Hallyn <[email protected]> <[email protected]>
+Sergey Senozhatsky <[email protected]> <[email protected]>
+Sergey Senozhatsky <[email protected]> <[email protected]>
+Sergey Senozhatsky <[email protected]> <[email protected]>
+Sergey Senozhatsky <[email protected]> <[email protected]>
 Seth Forshee <[email protected]> <[email protected]>
 Shakeel Butt <[email protected]> <[email protected]>
-Shannon Nelson <[email protected]> <[email protected]>
-Shannon Nelson <[email protected]> <[email protected]>
-Shannon Nelson <[email protected]> <[email protected]>
+Shannon Nelson <[email protected]> <[email protected]>
+Shannon Nelson <[email protected]> <[email protected]>
+Shannon Nelson <[email protected]> <[email protected]>
+Shannon Nelson <[email protected]> <[email protected]>
 Sharath Chandra Vurukala <[email protected]> <[email protected]>
 Shiraz Hashim <[email protected]> <[email protected]>
 Shuah Khan <[email protected]> <[email protected]>
@@ -827,3 +837,6 @@ Yosry Ahmed <[email protected]> <[email protected]>
 Yusuke Goda <[email protected]>
 Zack Rusin <[email protected]> <[email protected]>
 Zhu Yanjun <[email protected]> <[email protected]>
+Zijun Hu <[email protected]> <[email protected]>
+Zijun Hu <[email protected]> <[email protected]>
+Zijun Hu <[email protected]>

CREDITS

@@ -1397,6 +1397,10 @@ N: Thomas Gleixner
 E: [email protected]
 D: NAND flash hardware support, JFFS2 on NAND flash
 
+N: Jérôme Glisse
+E: [email protected]
+D: HMM - Heterogeneous Memory Management
+
 N: Richard E. Gooch
 E: [email protected]
 D: parent process death signal to children
@@ -2981,6 +2985,11 @@ S: 521 Pleasant Valley Road
 S: Potsdam, New York 13676
 S: USA
 
+N: Shannon Nelson
+E: [email protected]
+D: Worked on several network drivers including
+D: ixgbe, i40e, ionic, pds_core, pds_vdpa, pds_fwctl
+
 N: Dave Neuer
 E: [email protected]
 D: Helped implement support for Compaq's H31xx series iPAQs

Documentation/ABI/testing/sysfs-devices-power

@@ -56,7 +56,7 @@ Date:		January 2009
 Contact:	Rafael J. Wysocki <[email protected]>
 Description:
 		The /sys/devices/.../async attribute allows the user space to
-		enable or diasble the device's suspend and resume callbacks to
+		enable or disable the device's suspend and resume callbacks to
 		be executed asynchronously (ie. in separate threads, in parallel
 		with the main suspend/resume thread) during system-wide power
 		transitions (eg. suspend to RAM, hibernation).

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

@@ -584,6 +584,7 @@ What:		/sys/devices/system/cpu/vulnerabilities
 		/sys/devices/system/cpu/vulnerabilities/spectre_v1
 		/sys/devices/system/cpu/vulnerabilities/spectre_v2
 		/sys/devices/system/cpu/vulnerabilities/srbds
+		/sys/devices/system/cpu/vulnerabilities/tsa
 		/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
 Date:		January 2018
 Contact:	Linux kernel mailing list <[email protected]>

Documentation/ABI/testing/sysfs-driver-ufs

@@ -711,7 +711,7 @@ Description:	This file shows the thin provisioning type. This is one of
 
 		The file is read only.
 
-What:		/sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resourse_count
+What:		/sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resource_count
 Date:		February 2018
 Contact:	Stanislav Nijnikov <[email protected]>
 Description:	This file shows the total physical memory resources. This is

Documentation/ABI/testing/sysfs-edac-scrub

@@ -49,6 +49,12 @@ Description:
 		(RO) Supported minimum scrub cycle duration in seconds
 		by the memory scrubber.
 
+		Device-based scrub: returns the minimum scrub cycle
+		supported by the memory device.
+
+		Region-based scrub: returns the max of minimum scrub cycles
+		supported by individual memory devices that back the region.
+
 What:		/sys/bus/edac/devices/<dev-name>/scrubX/max_cycle_duration
 Date:		March 2025
 KernelVersion:	6.15
@@ -57,6 +63,16 @@ Description:
 		(RO) Supported maximum scrub cycle duration in seconds
 		by the memory scrubber.
 
+		Device-based scrub: returns the maximum scrub cycle supported
+		by the memory device.
+
+		Region-based scrub: returns the min of maximum scrub cycles
+		supported by individual memory devices that back the region.
+
+		If the memory device does not provide maximum scrub cycle
+		information, return the maximum supported value of the scrub
+		cycle field.
+
 What:		/sys/bus/edac/devices/<dev-name>/scrubX/current_cycle_duration
 Date:		March 2025
 KernelVersion:	6.15

Documentation/admin-guide/cgroup-v2.rst

@@ -1732,12 +1732,6 @@ The following nested keys are defined.
 	  numa_hint_faults (npn)
 		Number of NUMA hinting faults.
 
-	  numa_task_migrated (npn)
-		Number of task migration by NUMA balancing.
-
-	  numa_task_swapped (npn)
-		Number of task swap by NUMA balancing.
-
 	  pgdemote_kswapd
 		Number of pages demoted by kswapd.
 

Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst

@@ -157,9 +157,7 @@ This is achieved by using the otherwise unused and obsolete VERW instruction in
 combination with a microcode update. The microcode clears the affected CPU
 buffers when the VERW instruction is executed.
 
-Kernel reuses the MDS function to invoke the buffer clearing:
-
-	mds_clear_cpu_buffers()
+Kernel does the buffer clearing with x86_clear_cpu_buffers().
 
 On MDS affected CPUs, the kernel already invokes CPU buffer clear on
 kernel/userspace, hypervisor/guest and C-state (idle) transitions. No

Documentation/admin-guide/kernel-parameters.txt

@@ -7488,6 +7488,19 @@
 			having this key zero'ed is acceptable. E.g. in testing
 			scenarios.
 
+	tsa=		[X86] Control mitigation for Transient Scheduler
+			Attacks on AMD CPUs. Search the following in your
+			favourite search engine for more details:
+
+			"Technical guidance for mitigating transient scheduler
+			attacks".
+
+			off		- disable the mitigation
+			on		- enable the mitigation (default)
+			user		- mitigate only user/kernel transitions
+			vm		- mitigate only guest/host transitions
+
+
 	tsc=		Disable clocksource stability checks for TSC.
 			Format: <string>
 			[x86] reliable: mark tsc clocksource as reliable, this

Documentation/arch/arm64/booting.rst

@@ -234,7 +234,7 @@ Before jumping into the kernel, the following conditions must be met:
 
   - If the kernel is entered at EL1:
 
-      - ICC.SRE_EL2.Enable (bit 3) must be initialised to 0b1
+      - ICC_SRE_EL2.Enable (bit 3) must be initialised to 0b1
       - ICC_SRE_EL2.SRE (bit 0) must be initialised to 0b1.
 
   - The DT or ACPI tables must describe a GICv3 interrupt controller.