Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (e47fd9be) · Commits · git / linux-nf

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,7 @@ Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
		Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
		David Brownell <david-b@pacbell.net>
		David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
		David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
		David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>
		David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>
		David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>

Documentation/admin-guide/kernel-parameters.txt

+1 −3

Original line number	Diff line number	Diff line
		@@ -4798,11 +4798,9 @@

		profile= [KNL] Enable kernel profiling via /proc/profile
		Format: [<profiletype>,]<number>
		Param: <profiletype>: "schedule", "sleep", or "kvm"
		Param: <profiletype>: "schedule" or "kvm"
		[defaults to kernel profiling]
		Param: "schedule" - profile schedule points.
		Param: "sleep" - profile D-state sleeping (millisecs).
		Requires CONFIG_SCHEDSTATS
		Param: "kvm" - profile VM exits.
		Param: <number> - step/bucket size as a power of 2 for
		statistical time based profiling.

Documentation/arch/arm64/silicon-errata.rst

+18 −0

Original line number	Diff line number	Diff line
		@@ -122,10 +122,18 @@ stable kernels.
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A76 \| #1490853 \| N/A \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A76 \| #3324349 \| ARM64_ERRATUM_3194386 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A77 \| #1491015 \| N/A \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A77 \| #1508412 \| ARM64_ERRATUM_1508412 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A77 \| #3324348 \| ARM64_ERRATUM_3194386 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A78 \| #3324344 \| ARM64_ERRATUM_3194386 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A78C \| #3324346,3324347\| ARM64_ERRATUM_3194386 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A710 \| #2119858 \| ARM64_ERRATUM_2119858 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A710 \| #2054223 \| ARM64_ERRATUM_2054223 \|
		@@ -138,8 +146,14 @@ stable kernels.
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A720 \| #3456091 \| ARM64_ERRATUM_3194386 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A725 \| #3456106 \| ARM64_ERRATUM_3194386 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-X1 \| #1502854 \| N/A \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-X1 \| #3324344 \| ARM64_ERRATUM_3194386 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-X1C \| #3324346 \| ARM64_ERRATUM_3194386 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-X2 \| #2119858 \| ARM64_ERRATUM_2119858 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-X2 \| #2224489 \| ARM64_ERRATUM_2224489 \|
		@@ -160,6 +174,8 @@ stable kernels.
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Neoverse-N1 \| #1542419 \| ARM64_ERRATUM_1542419 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Neoverse-N1 \| #3324349 \| ARM64_ERRATUM_3194386 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Neoverse-N2 \| #2139208 \| ARM64_ERRATUM_2139208 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Neoverse-N2 \| #2067961 \| ARM64_ERRATUM_2067961 \|
		@@ -170,6 +186,8 @@ stable kernels.
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Neoverse-V1 \| #1619801 \| N/A \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Neoverse-V1 \| #3324341 \| ARM64_ERRATUM_3194386 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Neoverse-V2 \| #3324336 \| ARM64_ERRATUM_3194386 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Neoverse-V3 \| #3312417 \| ARM64_ERRATUM_3194386 \|

Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml

+3 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,9 @@ properties:
		ports-implemented:
		const: 1

		power-domains:
		maxItems: 1

		sata-port@0:
		$ref: /schemas/ata/snps,dwc-ahci-common.yaml#/$defs/dwc-ahci-port

Documentation/driver-api/thermal/sysfs-api.rst

+30 −35

Original line number	Diff line number	Diff line
		@@ -4,8 +4,6 @@ Generic Thermal Sysfs driver How To

		Written by Sujith Thomas <sujith.thomas@intel.com>, Zhang Rui <rui.zhang@intel.com>

		Updated: 2 January 2008

		Copyright (c) 2008 Intel Corporation


		@@ -38,23 +36,23 @@ temperature) and throttle appropriate devices.

		::

		struct thermal_zone_device
		thermal_zone_device_register(char type,
		int trips, int mask, void *devdata,
		struct thermal_zone_device_ops *ops,
		struct thermal_zone_device *
		thermal_zone_device_register_with_trips(const char *type,
		const struct thermal_trip *trips,
		int num_trips, void *devdata,
		const struct thermal_zone_device_ops *ops,
		const struct thermal_zone_params *tzp,
		int passive_delay, int polling_delay))
		unsigned int passive_delay,
		unsigned int polling_delay)

		This interface function adds a new thermal zone device (sensor) to
		This interface function adds a new thermal zone device (sensor) to the
		/sys/class/thermal folder as `thermal_zone[0-*]`. It tries to bind all the
		thermal cooling devices registered at the same time.
		thermal cooling devices registered to it at the same time.

		type:
		the thermal zone type.
		trips:
		the total number of trip points this thermal zone supports.
		mask:
		Bit string: If 'n'th bit is set, then trip point 'n' is writable.
		the table of trip points for this thermal zone.
		devdata:
		device private data
		ops:
		@@ -70,29 +68,26 @@ temperature) and throttle appropriate devices.
		set the trip points window. Whenever the current temperature
		is updated, the trip points immediately below and above the
		current temperature are found.
		.get_mode:
		get the current mode (enabled/disabled) of the thermal zone.

		- "enabled" means the kernel thermal management is
		enabled.
		- "disabled" will prevent kernel thermal driver action
		upon trip points so that user applications can take
		charge of thermal management.
		.set_mode:
		set the mode (enabled/disabled) of the thermal zone.
		.get_trip_type:
		get the type of certain trip point.
		.get_trip_temp:
		get the temperature above which the certain trip point
		will be fired.
		.change_mode:
		change the mode (enabled/disabled) of the thermal zone.
		.set_trip_temp:
		set the temperature of a given trip point.
		.get_crit_temp:
		get the critical temperature for this thermal zone.
		.set_emul_temp:
		set the emulation temperature which helps in debugging
		different threshold temperature points.
		.get_trend:
		get the trend of most recent zone temperature changes.
		.hot:
		hot trip point crossing handler.
		.critical:
		critical trip point crossing handler.
		tzp:
		thermal zone platform parameters.
		passive_delay:
		number of milliseconds to wait between polls when
		performing passive cooling.
		number of milliseconds to wait between polls when performing passive
		cooling.
		polling_delay:
		number of milliseconds to wait between polls when checking
		whether trip points have been crossed (0 for interrupt driven systems).