Commit 3321e97e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Cross-merge networking fixes after downstream PR (net-6.16-rc6).

No conflicts.

Adjacent changes:

Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
  0a12c435 ("dt-bindings: net: sun8i-emac: Add A100 EMAC compatible")
  b3603c04 ("dt-bindings: net: sun8i-emac: Rename A523 EMAC0 to GMAC0")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e090f978 bc9ff192

Documentation/ABI/testing/sysfs-devices-power

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ Date: January 2009 
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

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

+1 −0
Original line number Diff line number Diff line
@@ -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 <linux-kernel@vger.kernel.org>

Documentation/ABI/testing/sysfs-driver-ufs

+1 −1
Original line number Diff line number Diff line
@@ -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 <stanislav.nijnikov@wdc.com>

Description:	This file shows the total physical memory resources. This is

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

+1 −3
Original line number Diff line number Diff line
@@ -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

+13 −0
Original line number Diff line number Diff line
@@ -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