Commit 87143817 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

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



Cross-merge bpf fixes after downstream PR.

In particular to bring the fix in
commit aa30eb32 ("bpf: Force checkpoint when jmp history is too long").
The follow up verifier work depends on it.
And the fix in
commit 6801cf78 ("selftests/bpf: Use -4095 as the bad address for bits iterator").
It's fixing instability of BPF CI on s390 arch.

No conflicts.

Adjacent changes in:
Auto-merging arch/Kconfig
Auto-merging kernel/bpf/helpers.c
Auto-merging kernel/bpf/memalloc.c
Auto-merging kernel/bpf/verifier.c
Auto-merging mm/slab_common.c

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents b41ec3e6 9f8e716d

.mailmap

+4 −2
Original line number Diff line number Diff line
@@ -199,7 +199,8 @@ Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org> 
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>

Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@microchip.com>

Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@collabora.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
@@ -282,7 +283,7 @@ Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com> 
Jan Kuliga <jtkuliga.kdev@gmail.com> <jankul@alatek.krakow.pl>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@parity.io>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -664,6 +665,7 @@ Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com> 
Thomas Graf <tgraf@suug.ch>

Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>

Thomas Pedersen <twp@codeaurora.org>

Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>

Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>

Tingwei Zhang <quic_tingwei@quicinc.com> <tingwei@codeaurora.org>

Tirupathi Reddy <quic_tirupath@quicinc.com> <tirupath@codeaurora.org>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,10 @@ S: Dreisbachstrasse 24 
S: D-57250 Netphen

S: Germany



N: Florian Fainelli

E: f.fainelli@gmail.com

D: DSA



N: Rik Faith

E: faith@acm.org

D: Future Domain TMC-16x0 SCSI driver (author)

Documentation/admin-guide/cgroup-v2.rst

+9 −0
Original line number Diff line number Diff line
@@ -1599,6 +1599,15 @@ The following nested keys are defined. 
	  pglazyfreed (npn)

		Amount of reclaimed lazyfree pages



	  swpin_zero

		Number of pages swapped into memory and filled with zero, where I/O

		was optimized out because the page content was detected to be zero

		during swapout.



	  swpout_zero

		Number of zero-filled pages swapped out with I/O skipped due to the

		content being detected as zero.



	  zswpin

		Number of pages moved in to memory from zswap.

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -6688,7 +6688,7 @@ 
			0: no polling (default)



	thp_anon=	[KNL]

			Format: <size>,<size>[KMG]:<state>;<size>-<size>[KMG]:<state>

			Format: <size>[KMG],<size>[KMG]:<state>;<size>[KMG]-<size>[KMG]:<state>

			state is one of "always", "madvise", "never" or "inherit".

			Control the default behavior of the system with respect

			to anonymous transparent hugepages.

Documentation/admin-guide/mm/transhuge.rst

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ control by passing the parameter ``transparent_hugepage=always`` or 
kernel command line.



Alternatively, each supported anonymous THP size can be controlled by

passing ``thp_anon=<size>,<size>[KMG]:<state>;<size>-<size>[KMG]:<state>``,

passing ``thp_anon=<size>[KMG],<size>[KMG]:<state>;<size>[KMG]-<size>[KMG]:<state>``,

where ``<size>`` is the THP size (must be a power of 2 of PAGE_SIZE and

supported anonymous THP)  and ``<state>`` is one of ``always``, ``madvise``,

``never`` or ``inherit``.