Commit cf1ca1f6 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:

net/ipv4/ip_gre.c
  17af4205 ("erspan: make sure erspan_base_hdr is present in skb->head")
  5832c4a7 ("ip_tunnel: convert __be16 tunnel flags to bitmaps")
https://lore.kernel.org/all/20240402103253.3b54a1cf@canb.auug.org.au/



Adjacent changes:

net/ipv6/ip6_fib.c
  d21d4060 ("ipv6: Fix infinite recursion in fib6_dump_done().")
  5fc68320 ("ipv6: remove RTNL protection from inet6_dump_fib()")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1148c409 c88b9b4c

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -6599,7 +6599,7 @@ 
			To turn off having tracepoints sent to printk,

			 echo 0 > /proc/sys/kernel/tracepoint_printk

			Note, echoing 1 into this file without the

			tracepoint_printk kernel cmdline option has no effect.

			tp_printk kernel cmdline option has no effect.



			The tp_printk_stop_on_boot (see below) can also be used

			to stop the printing of events to console at

Documentation/admin-guide/mm/zswap.rst

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ Setting this parameter to 100 will disable the hysteresis. 


Some users cannot tolerate the swapping that comes with zswap store failures

and zswap writebacks. Swapping can be disabled entirely (without disabling

zswap itself) on a cgroup-basis as follows:

zswap itself) on a cgroup-basis as follows::



	echo 0 > /sys/fs/cgroup/<cgroup-name>/memory.zswap.writeback
@@ -166,7 +166,7 @@ writeback (because the same pages might be rejected again and again). 
When there is a sizable amount of cold memory residing in the zswap pool, it

can be advantageous to proactively write these cold pages to swap and reclaim

the memory for other use cases. By default, the zswap shrinker is disabled.

User can enable it as follows:

User can enable it as follows::



  echo Y > /sys/module/zswap/parameters/shrinker_enabled

Documentation/arch/x86/resctrl.rst

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ Memory b/w domain is L3 cache. 
	MB:<cache_id0>=bandwidth0;<cache_id1>=bandwidth1;...



Memory bandwidth Allocation specified in MiBps

---------------------------------------------

----------------------------------------------



Memory bandwidth domain is L3 cache.

::

Documentation/dev-tools/testing-overview.rst

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ Some of these tools are listed below: 
  KASAN and can be used in production. See Documentation/dev-tools/kfence.rst

* lockdep is a locking correctness validator. See

  Documentation/locking/lockdep-design.rst

* Runtime Verification (RV) supports checking specific behaviours for a given

  subsystem. See Documentation/trace/rv/runtime-verification.rst

* There are several other pieces of debug instrumentation in the kernel, many

  of which can be found in lib/Kconfig.debug

Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml

+4 −0
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ properties: 


  local-bd-address: true



  qcom,local-bd-address-broken:

    type: boolean

    description:

      boot firmware is incorrectly passing the address in big-endian order



required:

  - compatible