Commit 886178a3 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc3 



Cross-merge BPF, perf and other fixes after downstream PRs.
It restores BPF CI to green after critical fix
commit bc4394e5 ("perf: Fix the throttle error of some clock events")

No conflicts.

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 5046acc1 e34a79b9

.mailmap

+22 −5
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>
@@ -195,6 +197,7 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch> 
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>

Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>

Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>

Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>

David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>

David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
@@ -280,6 +283,7 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br> 
Gustavo Padovan <padovan@profusion.mobi>

Hamza Mahfooz <hamzamahfooz@linux.microsoft.com> <hamza.mahfooz@amd.com>

Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Hans de Goede <hansg@kernel.org> <hdegoede@redhat.com>

Hans Verkuil <hverkuil@xs4all.nl> <hansverk@cisco.com>

Hans Verkuil <hverkuil@xs4all.nl> <hverkuil-cisco@xs4all.nl>

Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>
@@ -424,6 +428,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 +607,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 +653,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>
@@ -678,9 +693,10 @@ Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com> 
Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>

Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>

Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>

Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@oracle.com>

Shannon Nelson <sln@onemain.com> <shannon.nelson@amd.com>

Shannon Nelson <sln@onemain.com> <snelson@pensando.io>

Shannon Nelson <sln@onemain.com> <shannon.nelson@intel.com>

Shannon Nelson <sln@onemain.com> <shannon.nelson@oracle.com>

Sharath Chandra Vurukala <quic_sharathv@quicinc.com> <sharathv@codeaurora.org>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
@@ -709,6 +725,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>

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -2981,6 +2981,11 @@ S: 521 Pleasant Valley Road 
S: Potsdam, New York 13676

S: USA



N: Shannon Nelson

E: sln@onemain.com

D: Worked on several network drivers including

D: ixgbe, i40e, ionic, pds_core, pds_vdpa, pds_fwctl



N: Dave Neuer

E: dave.neuer@pobox.com

D: Helped implement support for Compaq's H31xx series iPAQs

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".