Commit 681c5b51 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Adjacent changes:

net/mptcp/protocol.h
  63740448 ("mptcp: fix accept vs worker race")
  2a6a870e ("mptcp: stops worker on unaccepted sockets at listener close")
  ddb1a072 ("mptcp: move first subflow allocation at mpc access time")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e315e7b8 0f2a4af2

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -232,6 +232,8 @@ Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com> 
John Crispin <john@phrozen.org> <blogic@openwrt.org>

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

John Stultz <johnstul@us.ibm.com>

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

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

Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>

<josh@joshtriplett.org> <josh@freedesktop.org>

<josh@joshtriplett.org> <josh@kernel.org>
@@ -297,6 +299,8 @@ Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm> 
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>

Mathieu Othacehe <m.othacehe@gmail.com>

Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>

Mat Martineau <martineau@kernel.org> <mathewm@codeaurora.org>

Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>

Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>

Matthew Wilcox <willy@infradead.org> <mawilcox@linuxonhyperv.com>

Documentation/admin-guide/kernel-parameters.rst

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ parameter is applicable:: 
	KVM	Kernel Virtual Machine support is enabled.

	LIBATA  Libata driver is enabled

	LP	Printer support is enabled.

	LOONGARCH LoongArch architecture is enabled.

	LOOP	Loopback device support is enabled.

	M68k	M68k architecture is enabled.

			These options have more detailed description inside of

Documentation/admin-guide/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -6933,6 +6933,12 @@ 
			When enabled, memory and cache locality will be

			impacted.



	writecombine=	[LOONGARCH] Control the MAT (Memory Access Type) of

			ioremap_wc().



			on   - Enable writecombine, use WUC for ioremap_wc()

			off  - Disable writecombine, use SUC for ioremap_wc()



	x2apic_phys	[X86-64,APIC] Use x2apic physical mode instead of

			default x2apic cluster mode on platforms

			supporting x2apic.

Documentation/kbuild/llvm.rst

+4 −0
Original line number Diff line number Diff line
@@ -171,6 +171,10 @@ Getting Help 
Getting LLVM

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



We provide prebuilt stable versions of LLVM on `kernel.org <https://kernel.org/pub/tools/llvm/>`_.

Below are links that may be useful for building LLVM from source or procuring

it through a distribution's package manager.



- https://releases.llvm.org/download.html

- https://github.com/llvm/llvm-project

- https://llvm.org/docs/GettingStarted.html

Documentation/networking/devlink/ice.rst

+15 −0
Original line number Diff line number Diff line
@@ -7,6 +7,21 @@ ice devlink support 
This document describes the devlink features implemented by the ``ice``

device driver.



Parameters

==========



.. list-table:: Generic parameters implemented



   * - Name

     - Mode

     - Notes

   * - ``enable_roce``

     - runtime

     - mutually exclusive with ``enable_iwarp``

   * - ``enable_iwarp``

     - runtime

     - mutually exclusive with ``enable_roce``



Info versions

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