Commit 816cd168 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

include/net/sock.h
  310731e2 ("net: Fix data-races around sysctl_mem.")
  e70f3c70 ("Revert "net: set SK_MEM_QUANTUM to 4096"")
https://lore.kernel.org/all/20220711120211.7c8b7cba@canb.auug.org.au/



net/ipv4/fib_semantics.c
  747c1430 ("ip: fix dflt addr selection for connected nexthop")
  d62607c3 ("net: rename reference+tracking helpers")

net/tls/tls.h
include/net/tls.h
  3d8c51b2 ("net/tls: Check for errors in tls_device_init")
  58790314 ("tls: create an internal header")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b126047f db886979

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com> 
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>

Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>

Documentation/admin-guide/kernel-parameters.txt

+25 −0
Original line number Diff line number Diff line
@@ -5197,6 +5197,30 @@ 


	retain_initrd	[RAM] Keep initrd memory after extraction



	retbleed=	[X86] Control mitigation of RETBleed (Arbitrary

			Speculative Code Execution with Return Instructions)

			vulnerability.



			off          - no mitigation

			auto         - automatically select a migitation

			auto,nosmt   - automatically select a mitigation,

				       disabling SMT if necessary for

				       the full mitigation (only on Zen1

				       and older without STIBP).

			ibpb	     - mitigate short speculation windows on

				       basic block boundaries too. Safe, highest

				       perf impact.

			unret        - force enable untrained return thunks,

				       only effective on AMD f15h-f17h

				       based systems.

			unret,nosmt  - like unret, will disable SMT when STIBP

			               is not available.



			Selecting 'auto' will choose a mitigation method at run

			time according to the CPU.



			Not specifying this option is equivalent to retbleed=auto.



	rfkill.default_state=

		0	"airplane mode".  All wifi, bluetooth, wimax, gps, fm,

			etc. communication is blocked by default.
@@ -5568,6 +5592,7 @@ 
			eibrs		  - enhanced IBRS

			eibrs,retpoline   - enhanced IBRS + Retpolines

			eibrs,lfence      - enhanced IBRS + LFENCE

			ibrs		  - use IBRS to protect kernel



			Not specifying this option is equivalent to

			spectre_v2=auto.

Documentation/core-api/kernel-api.rst

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ Module Loading 
Inter Module support

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



Refer to the file kernel/module.c for more information.

Refer to the files in kernel/module/ for more information.



Hardware Interfaces

===================

Documentation/core-api/symbol-namespaces.rst

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ namespace ``USB_STORAGE``, use:: 
The corresponding ksymtab entry struct ``kernel_symbol`` will have the member

``namespace`` set accordingly. A symbol that is exported without a namespace will

refer to ``NULL``. There is no default namespace if none is defined. ``modpost``

and kernel/module.c make use the namespace at build time or module load time,

respectively.

and kernel/module/main.c make use the namespace at build time or module load

time, respectively.



2.2 Using the DEFAULT_SYMBOL_NAMESPACE define

=============================================

Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ if: 
then:

  properties:

    clocks:

      maxItems: 2

      minItems: 2



  required:

    - clock-names