Commit 50c374c6 authored Aug 22, 2024 by Alexei Starovoitov

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

Cross-merge bpf fixes after downstream PR including
important fixes (from bpf-next point of view):
commit 41c24102 ("selftests/bpf: Filter out _GNU_SOURCE when compiling test_cpp")
commit fdad456c ("bpf: Fix updating attached freplace prog in prog_array map")

No conflicts.

Adjacent changes in:
include/linux/bpf_verifier.h
kernel/bpf/verifier.c
tools/testing/selftests/bpf/Makefile

Link: https://lore.kernel.org/bpf/20240813234307.82773-1-alexei.starovoitov@gmail.com/


Signed-off-by: Alexei Starovoitov <ast@kernel.org>

parents d352eca2 872cf28b

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,7 @@ Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
		Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.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>
		David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>
		David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>
		David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
		@@ -260,6 +261,7 @@ Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
		Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>
		James Bottomley <jejb@mulgrave.(none)>
		James Bottomley <jejb@titanic.il.steeleye.com>
		James Clark <james.clark@linaro.org> <james.clark@arm.com>
		James E Wilson <wilson@specifix.com>
		James Hogan <jhogan@kernel.org> <james@albanarts.com>
		James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

Documentation/ABI/testing/debugfs-cxl

+4 −3

Original line number	Diff line number	Diff line
		@@ -14,9 +14,10 @@ Description:
		event to its internal Informational Event log, updates the
		Event Status register, and if configured, interrupts the host.
		It is not an error to inject poison into an address that
		already has poison present and no error is returned. The
		inject_poison attribute is only visible for devices supporting
		the capability.
		already has poison present and no error is returned. If the
		device returns 'Inject Poison Limit Reached' an -EBUSY error
		is returned to the user. The inject_poison attribute is only
		visible for devices supporting the capability.


		What: /sys/kernel/debug/memX/clear_poison

Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu

+3 −3

Original line number	Diff line number	Diff line
		@@ -32,9 +32,9 @@ Description: (RW) The front button on the Turris Omnia router can be
		interrupt.

		This file switches between these two modes:
		- "mcu" makes the button press event be handled by the MCU to
		- ``mcu`` makes the button press event be handled by the MCU to
		change the LEDs panel intensity.
		- "cpu" makes the button press event be handled by the CPU.
		- ``cpu`` makes the button press event be handled by the CPU.

		Format: %s.

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -562,7 +562,8 @@ Description: Control Symmetric Multi Threading (SMT)
		================ =========================================

		If control status is "forceoff" or "notsupported" writes
		are rejected.
		are rejected. Note that enabling SMT on PowerPC skips
		offline cores.

		What: /sys/devices/system/cpu/cpuX/power/energy_perf_bias
		Date: March 2019

Documentation/admin-guide/cifs/usage.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -742,7 +742,7 @@ SecurityFlags Flags which control security negotiation and
		may use NTLMSSP 0x00080
		must use NTLMSSP 0x80080
		seal (packet encryption) 0x00040
		must seal (not implemented yet) 0x40040
		must seal 0x40040

		cifsFYI If set to non-zero value, additional debug information
		will be logged to the system error log. This field