Commit aaa25a2f authored Feb 24, 2022 by Jakub Kicinski

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

tools/testing/selftests/net/mptcp/mptcp_join.sh
  34aa6e3b ("selftests: mptcp: add ip mptcp wrappers")

  857898eb ("selftests: mptcp: add missing join check")
  6ef84b15 ("selftests: mptcp: more robust signal race test")
https://lore.kernel.org/all/20220221131842.468893-1-broonie@kernel.org/



drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c
  fb7e76ea ("net/mlx5e: TC, Skip redundant ct clear actions")
  c63741b4 ("net/mlx5e: Fix MPLSoUDP encap to use MPLS action information")

  09bf9792 ("net/mlx5e: TC, Move pedit_headers_action to parse_attr")
  84ba8062 ("net/mlx5e: Test CT and SAMPLE on flow attr")
  efe6f961 ("net/mlx5e: CT, Don't set flow flag CT for ct clear flow")
  3b49a7ed ("net/mlx5e: TC, Reject rules with multiple CT actions")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents 9e7b78dc d8152cfe

Documentation/ABI/testing/sysfs-class-power

+1 −0

Original line number	Diff line number	Diff line
		@@ -468,6 +468,7 @@ Description:
		auto: Charge normally, respect thresholds
		inhibit-charge: Do not charge while AC is attached
		force-discharge: Force discharge while AC is attached
		================ ====================================

		What: /sys/class/power_supply/<supply_name>/technology
		Date: May 2007

Documentation/devicetree/bindings/gpio/sifive,gpio.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: SiFive GPIO controller

		maintainers:
		- Yash Shah <yash.shah@sifive.com>
		- Paul Walmsley <paul.walmsley@sifive.com>

		properties:

Documentation/devicetree/bindings/mfd/ti,j721e-system-controller.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ description: \|

		maintainers:
		- Kishon Vijay Abraham I <kishon@ti.com>
		- Roger Quadros <rogerq@ti.com
		- Roger Quadros <rogerq@kernel.org>

		properties:
		compatible:

Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ title: OMAP USB2 PHY

		maintainers:
		- Kishon Vijay Abraham I <kishon@ti.com>
		- Roger Quadros <rogerq@ti.com>
		- Roger Quadros <rogerq@kernel.org>

		properties:
		compatible:

Documentation/devicetree/bindings/pwm/pwm-sifive.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: SiFive PWM controller

		maintainers:
		- Yash Shah <yash.shah@sifive.com>
		- Sagar Kadam <sagar.kadam@sifive.com>
		- Paul Walmsley <paul.walmsley@sifive.com>