Commit 173780ff 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.

Conflicts:

include/linux/mlx5/driver.h
  617f5db1 ("RDMA/mlx5: Fix affinity assignment")
  dc131808 ("net/mlx5: Enable devlink port for embedded cpu VF vports")
https://lore.kernel.org/all/20230613125939.595e50b8@canb.auug.org.au/

tools/testing/selftests/net/mptcp/mptcp_join.sh
  47867f0a ("selftests: mptcp: join: skip check if MIB counter not supported")
  425ba803 ("selftests: mptcp: join: support RM_ADDR for used endpoints or not")
  45b1a122 ("mptcp: introduces more address related mibs")
  0639fa23 ("selftests: mptcp: add explicit check for new mibs")
https://lore.kernel.org/netdev/20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-0-2896fe2ee8a3@tessares.net/



No adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 97c5209b 40f71e7c

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com> 
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Keeping <john@keeping.me.uk> <john@metanate.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>

Documentation/admin-guide/cgroup-v2.rst

+10 −12
Original line number Diff line number Diff line
@@ -1213,23 +1213,25 @@ PAGE_SIZE multiple when read back. 
	A read-write single value file which exists on non-root

	cgroups.  The default is "max".



	Memory usage throttle limit.  This is the main mechanism to

	control memory usage of a cgroup.  If a cgroup's usage goes

	Memory usage throttle limit.  If a cgroup's usage goes

	over the high boundary, the processes of the cgroup are

	throttled and put under heavy reclaim pressure.



	Going over the high limit never invokes the OOM killer and

	under extreme conditions the limit may be breached.

	under extreme conditions the limit may be breached. The high

	limit should be used in scenarios where an external process

	monitors the limited cgroup to alleviate heavy reclaim

	pressure.



  memory.max

	A read-write single value file which exists on non-root

	cgroups.  The default is "max".



	Memory usage hard limit.  This is the final protection

	mechanism.  If a cgroup's memory usage reaches this limit and

	can't be reduced, the OOM killer is invoked in the cgroup.

	Under certain circumstances, the usage may go over the limit

	temporarily.

	Memory usage hard limit.  This is the main mechanism to limit

	memory usage of a cgroup.  If a cgroup's memory usage reaches

	this limit and can't be reduced, the OOM killer is invoked in

	the cgroup. Under certain circumstances, the usage may go

	over the limit temporarily.



	In default configuration regular 0-order allocations always

	succeed unless OOM killer chooses current task as a victim.
@@ -1238,10 +1240,6 @@ PAGE_SIZE multiple when read back. 
	Caller could retry them differently, return into userspace

	as -ENOMEM or silently ignore in cases like disk readahead.



	This is the ultimate protection mechanism.  As long as the

	high limit is used and monitored properly, this limit's

	utility is limited to providing the final safety net.



  memory.reclaim

	A write-only nested-keyed file which exists for all cgroups.

Documentation/devicetree/bindings/ata/ahci-common.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ title: Common Properties for Serial ATA AHCI controllers 


maintainers:

  - Hans de Goede <hdegoede@redhat.com>

  - Damien Le Moal <damien.lemoal@opensource.wdc.com>

  - Damien Le Moal <dlemoal@kernel.org>



description:

  This document defines device tree properties for a common AHCI SATA

Documentation/devicetree/bindings/cache/qcom,llcc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ allOf: 
              - qcom,sm8250-llcc

              - qcom,sm8350-llcc

              - qcom,sm8450-llcc

              - qcom,sm8550-llcc

    then:

      properties:

        reg:

Documentation/devicetree/bindings/clock/canaan,k210-clk.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Canaan Kendryte K210 Clock



maintainers:

  - Damien Le Moal <damien.lemoal@wdc.com>

  - Damien Le Moal <dlemoal@kernel.org>



description: |

  Canaan Kendryte K210 SoC clocks driver bindings. The clock