Merge remote-tracking branch 'torvalds/master' into perf/core (26bda3ca) · Commits · EulixOS / Software / Kernel

Documentation/networking/ip-sysctl.rst

+0 −15

Original line number	Diff line number	Diff line
		@@ -1849,21 +1849,6 @@ ip6frag_low_thresh - INTEGER
		ip6frag_time - INTEGER
		Time in seconds to keep an IPv6 fragment in memory.

		IPv6 Segment Routing:

		seg6_flowlabel - INTEGER
		Controls the behaviour of computing the flowlabel of outer
		IPv6 header in case of SR T.encaps

		== =======================================================
		-1 set flowlabel to zero.
		0 copy flowlabel from Inner packet in case of Inner IPv6
		(Set flowlabel to 0 in case IPv4/L2)
		1 Compute the flowlabel using seg6_make_flowlabel()
		== =======================================================

		Default is 0.

		``conf/default/*``:
		Change the interface-specific default settings.

+13 −0

Original line number	Diff line number	Diff line
		@@ -24,3 +24,16 @@ seg6_require_hmac - INTEGER
		* 1 - Drop SR packets without HMAC, validate SR packets with HMAC

		Default is 0.

		seg6_flowlabel - INTEGER
		Controls the behaviour of computing the flowlabel of outer
		IPv6 header in case of SR T.encaps

		== =======================================================
		-1 set flowlabel to zero.
		0 copy flowlabel from Inner packet in case of Inner IPv6
		(Set flowlabel to 0 in case IPv4/L2)
		1 Compute the flowlabel using seg6_make_flowlabel()
		== =======================================================

		Default is 0.

+4 −2

Original line number	Diff line number	Diff line
		@@ -1576,11 +1576,13 @@ R: Jernej Skrabec <jernej.skrabec@siol.net>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
		L: linux-sunxi@lists.linux.dev
		F: arch/arm/mach-sunxi/
		F: arch/arm64/boot/dts/allwinner/
		F: drivers/clk/sunxi-ng/
		F: drivers/pinctrl/sunxi/
		F: drivers/soc/sunxi/
		N: allwinner
		N: sun[x456789]i
		N: sun50i

		@@ -7096,7 +7098,7 @@ S: Maintained
		F: drivers/i2c/busses/i2c-cpm.c

		FREESCALE IMX / MXC FEC DRIVER
		M: Fugang Duan <fugang.duan@nxp.com>
		M: Joakim Zhang <qiangqing.zhang@nxp.com>
		L: netdev@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/net/fsl-fec.txt
		@@ -8524,9 +8526,9 @@ F: drivers/pci/hotplug/rpaphp*

		IBM Power SRIOV Virtual NIC Device Driver
		M: Dany Madden <drt@linux.ibm.com>
		M: Lijun Pan <ljp@linux.ibm.com>
		M: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
		R: Thomas Falcon <tlfalcon@linux.ibm.com>
		R: Lijun Pan <lijunp213@gmail.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/ethernet/ibm/ibmvnic.*

+1 −1

+7 −1

Original line number	Diff line number	Diff line
		@@ -1293,9 +1293,15 @@ config KASAN_SHADOW_OFFSET

		config NR_CPUS
		int "Maximum number of CPUs (2-32)"
		range 2 32
		range 2 16 if DEBUG_KMAP_LOCAL
		range 2 32 if !DEBUG_KMAP_LOCAL
		depends on SMP
		default "4"
		help
		The maximum number of CPUs that the kernel can support.
		Up to 32 CPUs can be supported, or up to 16 if kmap_local()
		debugging is enabled, which uses half of the per-CPU fixmap
		slots as guard regions.

		config HOTPLUG_CPU
		bool "Support for hot-pluggable CPUs"