Commit 5098462f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Cross-merge networking fixes after downstream PR (net-6.13-rc3).

No conflicts or adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f3674384 150b567e

Documentation/admin-guide/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -4822,6 +4822,11 @@ 
			       can be preempted anytime.  Tasks will also yield

			       contended spinlocks (if the critical section isn't

			       explicitly preempt disabled beyond the lock itself).

			lazy - Scheduler controlled. Similar to full but instead

			       of preempting the task immediately, the task gets

			       one HZ tick time to yield itself before the

			       preemption will be forced. One preemption is when the

			       task returns to user space.



	print-fatal-signals=

			[KNL] debug: print fatal signals

Documentation/arch/arm64/silicon-errata.rst

+3 −2
Original line number Diff line number Diff line
@@ -255,8 +255,9 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip08 SMMU PMCG | #162001800      | N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip{08,09,10,10C| #162001900      | N/A                         |

|                | ,11} SMMU PMCG  |                 |                             |

| Hisilicon      | Hip{08,09,09A,10| #162001900      | N/A                         |

|                | ,10C,11}        |                 |                             |

|                | SMMU PMCG       |                 |                             |

+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip09           | #162100801      | HISILICON_ERRATUM_162100801 |

+----------------+-----------------+-----------------+-----------------------------+

Documentation/devicetree/bindings/power/mediatek,power-controller.yaml

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ patternProperties: 
            patternProperties:

              "^power-domain@[0-9a-f]+$":

                $ref: "#/$defs/power-domain-node"

                patternProperties:

                  "^power-domain@[0-9a-f]+$":

                    $ref: "#/$defs/power-domain-node"

                    unevaluatedProperties: false

                unevaluatedProperties: false

            unevaluatedProperties: false

        unevaluatedProperties: false

Documentation/networking/ip-sysctl.rst

+6 −0
Original line number Diff line number Diff line
@@ -2184,6 +2184,12 @@ nexthop_compat_mode - BOOLEAN 
	understands the new API, this sysctl can be disabled to achieve full

	performance benefits of the new API by disabling the nexthop expansion

	and extraneous notifications.



	Note that as a backward-compatible mode, dumping of modern features

	might be incomplete or wrong. For example, resilient groups will not be

	shown as such, but rather as just a list of next hops. Also weights that

	do not fit into 8 bits will show incorrectly.



	Default: true (backward compat mode)



fib_notify_on_flag_change - INTEGER

MAINTAINERS

+5 −1
Original line number Diff line number Diff line
@@ -3383,6 +3383,8 @@ S: Maintained 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git

F:	Documentation/arch/arm64/

F:	arch/arm64/

F:	drivers/virt/coco/arm-cca-guest/

F:	drivers/virt/coco/pkvm-guest/

F:	tools/testing/selftests/arm64/

X:	arch/arm64/boot/dts/








@@ -15351,7 +15353,7 @@ M:	Daniel Machon <daniel.machon@microchip.com>







M:	UNGLinuxDriver@microchip.com









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/ethernet/microchip/lan969x/*









F:	drivers/net/ethernet/microchip/sparx5/lan969x/*

















MICROCHIP LCDFB DRIVER









M:	Nicolas Ferre <nicolas.ferre@microchip.com>








@@ -16343,6 +16345,7 @@ F:	Documentation/networking/







F:	Documentation/networking/net_cachelines/









F:	Documentation/process/maintainer-netdev.rst









F:	Documentation/userspace-api/netlink/









F:	include/linux/ethtool.h









F:	include/linux/framer/framer-provider.h









F:	include/linux/framer/framer.h









F:	include/linux/in.h








@@ -16357,6 +16360,7 @@ F:	include/linux/rtnetlink.h







F:	include/linux/seq_file_net.h









F:	include/linux/skbuff*









F:	include/net/









F:	include/uapi/linux/ethtool.h









F:	include/uapi/linux/genetlink.h









F:	include/uapi/linux/hsr_netlink.h









F:	include/uapi/linux/in.h