Commit 535de528 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-rc2).

No conflicts or adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5d6d67c4 27605c8c

.mailmap

+16 −2
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ Adam Radford <aradford@gmail.com> 
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>

Adrian Bunk <bunk@stusta.de>

Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>

Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>

Akhil P Oommen <akhilpo@oss.qualcomm.com> <akhilpo@codeaurora.org>

Akhil P Oommen <akhilpo@oss.qualcomm.com> <quic_akhilpo@quicinc.com>

Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
@@ -106,7 +107,8 @@ Asahi Lina <lina+kernel@asahilina.net> <lina@asahilina.net> 
Ashok Raj Nagarajan <quic_arnagara@quicinc.com> <arnagara@codeaurora.org>

Ashwin Chaugule <quic_ashwinc@quicinc.com> <ashwinc@codeaurora.org>

Asutosh Das <quic_asutoshd@quicinc.com> <asutoshd@codeaurora.org>

Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>

Atish Patra <atish.patra@linux.dev> <atishp@atishpatra.org>

Atish Patra <atish.patra@linux.dev> <atish.patra@wdc.com>

Avaneesh Kumar Dwivedi <quic_akdwived@quicinc.com> <akdwived@codeaurora.org>

Axel Dyks <xl@xlsigned.net>

Axel Lin <axel.lin@gmail.com>
@@ -424,6 +426,9 @@ Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com> 
Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>

Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Kuniyuki Iwashima <kuniyu@google.com> <kuniyu@amazon.com>

Kuniyuki Iwashima <kuniyu@google.com> <kuniyu@amazon.co.jp>

Kuniyuki Iwashima <kuniyu@google.com> <kuni1840@gmail.com>

Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>

Lee Jones <lee@kernel.org> <joneslee@google.com>

Lee Jones <lee@kernel.org> <lee.jones@canonical.com>
@@ -600,6 +605,12 @@ Paul Mackerras <paulus@ozlabs.org> <paulus@samba.org> 
Paul Mackerras <paulus@ozlabs.org> <paulus@au1.ibm.com>

Paul Moore <paul@paul-moore.com> <paul.moore@hp.com>

Paul Moore <paul@paul-moore.com> <pmoore@redhat.com>

Paulo Alcantara <pc@manguebit.org> <pcacjr@zytor.com>

Paulo Alcantara <pc@manguebit.org> <paulo@paulo.ac>

Paulo Alcantara <pc@manguebit.org> <pc@cjr.nz>

Paulo Alcantara <pc@manguebit.org> <palcantara@suse.de>

Paulo Alcantara <pc@manguebit.org> <palcantara@suse.com>

Paulo Alcantara <pc@manguebit.org> <pc@manguebit.com>

Pavankumar Kondeti <quic_pkondeti@quicinc.com> <pkondeti@codeaurora.org>

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

Peter Oruba <peter.oruba@amd.com>
@@ -640,6 +651,8 @@ Richard Genoud <richard.genoud@bootlin.com> <richard.genoud@gmail.com> 
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>

Rob Clark <robin.clark@oss.qualcomm.com> <robdclark@chromium.org>

Rob Clark <robin.clark@oss.qualcomm.com> <robdclark@gmail.com>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>

Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>

Rodrigo Siqueira <siqueira@igalia.com> <rodrigosiqueiramelo@gmail.com>
@@ -709,6 +722,7 @@ Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org> 
Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>

Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>

Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>

Stanislav Fomichev <sdf@fomichev.me> <stfomichev@gmail.com>

Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>

Documentation/ABI/testing/sysfs-bus-iio

+3 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ Description: 
What:		/sys/bus/iio/devices/iio:deviceX/sampling_frequency

What:		/sys/bus/iio/devices/iio:deviceX/in_intensity_sampling_frequency

What:		/sys/bus/iio/devices/iio:deviceX/buffer/sampling_frequency

What:		/sys/bus/iio/devices/iio:deviceX/events/sampling_frequency

What:		/sys/bus/iio/devices/triggerX/sampling_frequency

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org
@@ -740,7 +741,9 @@ Description: 
		1kohm_to_gnd: connected to ground via an 1kOhm resistor,

		2.5kohm_to_gnd: connected to ground via a 2.5kOhm resistor,

		6kohm_to_gnd: connected to ground via a 6kOhm resistor,

		7.7kohm_to_gnd: connected to ground via a 7.7kOhm resistor,

		20kohm_to_gnd: connected to ground via a 20kOhm resistor,

		32kohm_to_gnd: connected to ground via a 32kOhm resistor,

		42kohm_to_gnd: connected to ground via a 42kOhm resistor,

		90kohm_to_gnd: connected to ground via a 90kOhm resistor,

		100kohm_to_gnd: connected to ground via an 100kOhm resistor,

Documentation/ABI/testing/sysfs-driver-intel-m10-bmc

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Description: Read only. Returns the firmware version of Intel MAX10 
What:		/sys/bus/.../drivers/intel-m10-bmc/.../mac_address

Date:		January 2021

KernelVersion:  5.12

Contact:	Peter Colberg <peter.colberg@altera.com>

Contact:	Matthew Gerlach <matthew.gerlach@altera.com>

Description:	Read only. Returns the first MAC address in a block

		of sequential MAC addresses assigned to the board

		that is managed by the Intel MAX10 BMC. It is stored in
@@ -28,7 +28,7 @@ Description: Read only. Returns the first MAC address in a block 
What:		/sys/bus/.../drivers/intel-m10-bmc/.../mac_count

Date:		January 2021

KernelVersion:  5.12

Contact:	Peter Colberg <peter.colberg@altera.com>

Contact:	Matthew Gerlach <matthew.gerlach@altera.com>

Description:	Read only. Returns the number of sequential MAC

		addresses assigned to the board managed by the Intel

		MAX10 BMC. This value is stored in FLASH and is mirrored

Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update

+7 −7
Original line number Diff line number Diff line 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/sr_root_entry_hash

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Peter Colberg <peter.colberg@altera.com>

Contact:	Matthew Gerlach <matthew.gerlach@altera.com>

Description:	Read only. Returns the root entry hash for the static

		region if one is programmed, else it returns the

		string: "hash not programmed".  This file is only
@@ -11,7 +11,7 @@ Description: Read only. Returns the root entry hash for the static 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/pr_root_entry_hash

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Peter Colberg <peter.colberg@altera.com>

Contact:	Matthew Gerlach <matthew.gerlach@altera.com>

Description:	Read only. Returns the root entry hash for the partial

		reconfiguration region if one is programmed, else it

		returns the string: "hash not programmed".  This file
@@ -21,7 +21,7 @@ Description: Read only. Returns the root entry hash for the partial 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/bmc_root_entry_hash

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Peter Colberg <peter.colberg@altera.com>

Contact:	Matthew Gerlach <matthew.gerlach@altera.com>

Description:	Read only. Returns the root entry hash for the BMC image

		if one is programmed, else it returns the string:

		"hash not programmed".  This file is only visible if the
@@ -31,7 +31,7 @@ Description: Read only. Returns the root entry hash for the BMC image 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/sr_canceled_csks

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Peter Colberg <peter.colberg@altera.com>

Contact:	Matthew Gerlach <matthew.gerlach@altera.com>

Description:	Read only. Returns a list of indices for canceled code

		signing keys for the static region. The standard bitmap

		list format is used (e.g. "1,2-6,9").
@@ -39,7 +39,7 @@ Description: Read only. Returns a list of indices for canceled code 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/pr_canceled_csks

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Peter Colberg <peter.colberg@altera.com>

Contact:	Matthew Gerlach <matthew.gerlach@altera.com>

Description:	Read only. Returns a list of indices for canceled code

		signing keys for the partial reconfiguration region. The

		standard bitmap list format is used (e.g. "1,2-6,9").
@@ -47,7 +47,7 @@ Description: Read only. Returns a list of indices for canceled code 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/bmc_canceled_csks

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Peter Colberg <peter.colberg@altera.com>

Contact:	Matthew Gerlach <matthew.gerlach@altera.com>

Description:	Read only. Returns a list of indices for canceled code

		signing keys for the BMC.  The standard bitmap list format

		is used (e.g. "1,2-6,9").
@@ -55,7 +55,7 @@ Description: Read only. Returns a list of indices for canceled code 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/flash_count

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Peter Colberg <peter.colberg@altera.com>

Contact:	Matthew Gerlach <matthew.gerlach@altera.com>

Description:	Read only. Returns number of times the secure update

		staging area has been flashed.

		Format: "%u".

Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon

+10 −10
Original line number Diff line number Diff line
@@ -60,26 +60,26 @@ Description: RO. Package default power limit (default TDP setting). 


		Only supported for particular Intel Xe graphics platforms.



What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power2_crit

Date:		February 2024

KernelVersion:	6.8

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_crit

Date:		May 2025

KernelVersion:	6.15

Contact:	intel-xe@lists.freedesktop.org

Description:	RW. Package reactive critical (I1) power limit in microwatts.

Description:	RW. Card reactive critical (I1) power limit in microwatts.



		Package reactive critical (I1) power limit in microwatts is exposed

		Card reactive critical (I1) power limit in microwatts is exposed

		for client products. The power controller will throttle the

		operating frequency if the power averaged over a window exceeds

		this limit.



		Only supported for particular Intel Xe graphics platforms.



What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr2_crit

Date:		February 2024

KernelVersion:	6.8

What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr1_crit

Date:		May 2025

KernelVersion:	6.15

Contact:	intel-xe@lists.freedesktop.org

Description:	RW. Package reactive critical (I1) power limit in milliamperes.

Description:	RW. Card reactive critical (I1) power limit in milliamperes.



		Package reactive critical (I1) power limit in milliamperes is

		Card reactive critical (I1) power limit in milliamperes is

		exposed for server products. The power controller will throttle

		the operating frequency if the power averaged over a window

		exceeds this limit.