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

No conflicts.

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

diff --cc Documentation/devicetree/bindings/net/ethernet-controller.yaml
index 56d9aca8c95449afb445e16900fba1509c05567f,170cd201adc2e0d7cdf64a215453c453aa916e82..c138a1022879764af2c7e813b1a3688f67c24285
--- 1/Documentation/devicetree/bindings/net/ethernet-controller.yaml
--- 2/Documentation/devicetree/bindings/net/ethernet-controller.yaml
+++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
@@@ -155,94 -167,66 +155,89 @@@ properties
        - in-band-status
  
    fixed-link:
-     allOf:
-       - if:
-           type: array
-         then:
-           deprecated: true
-           items:
-             - minimum: 0
-               maximum: 31
-               description:
-                 Emulated PHY ID, choose any but unique to the all
-                 specified fixed-links
- 
-             - enum: [0, 1]
-               description:
-                 Duplex configuration. 0 for half duplex or 1 for
-                 full duplex
- 
-             - enum: [10, 100, 1000, 2500, 10000]
-               description:
-                 Link speed in Mbits/sec.
- 
-             - enum: [0, 1]
-               description:
-                 Pause configuration. 0 for no pause, 1 for pause
- 
-             - enum: [0, 1]
-               description:
-                 Asymmetric pause configuration. 0 for no asymmetric
-                 pause, 1 for asymmetric pause
- 
- 
-       - if:
-           type: object
-         then:
-           properties:
-             speed:
-               description:
-                 Link speed.
-               $ref: /schemas/types.yaml#/definitions/uint32
-               enum: [10, 100, 1000, 2500, 10000]
- 
-             full-duplex:
-               $ref: /schemas/types.yaml#/definitions/flag
-               description:
-                 Indicates that full-duplex is used. When absent, half
-                 duplex is assumed.
- 
-             pause:
-               $ref: /schemas/types.yaml#definitions/flag
-               description:
-                 Indicates that pause should be enabled.
- 
-             asym-pause:
-               $ref: /schemas/types.yaml#/definitions/flag
-               description:
-                 Indicates that asym_pause should be enabled.
- 
-             link-gpios:
-               maxItems: 1
-               description:
-                 GPIO to determine if the link is up
- 
-           required:
-             - speed
+     oneOf:
+       - $ref: /schemas/types.yaml#/definitions/uint32-array
+         deprecated: true
+         items:
+           - minimum: 0
+             maximum: 31
+             description:
+               Emulated PHY ID, choose any but unique to the all
+               specified fixed-links
+ 
+           - enum: [0, 1]
+             description:
+               Duplex configuration. 0 for half duplex or 1 for
+               full duplex
+ 
+           - enum: [10, 100, 1000, 2500, 10000]
+             description:
+               Link speed in Mbits/sec.
+ 
+           - enum: [0, 1]
+             description:
+               Pause configuration. 0 for no pause, 1 for pause
+ 
+           - enum: [0, 1]
+             description:
+               Asymmetric pause configuration. 0 for no asymmetric
+               pause, 1 for asymmetric pause
+       - type: object
+         additionalProperties: false
+         properties:
+           speed:
+             description:
+               Link speed.
+             $ref: /schemas/types.yaml#/definitions/uint32
+             enum: [10, 100, 1000, 2500, 10000]
+ 
+           full-duplex:
+             $ref: /schemas/types.yaml#/definitions/flag
+             description:
+               Indicates that full-duplex is used. When absent, half
+               duplex is assumed.
+ 
+           pause:
+             $ref: /schemas/types.yaml#definitions/flag
+             description:
+               Indicates that pause should be enabled.
+ 
+           asym-pause:
+             $ref: /schemas/types.yaml#/definitions/flag
+             description:
+               Indicates that asym_pause should be enabled.
+ 
+           link-gpios:
+             maxItems: 1
+             description:
+               GPIO to determine if the link is up
+ 
+         required:
+           - speed
  
 +allOf:
 +  - if:
 +      properties:
 +        phy-mode:
 +          contains:
 +            enum:
 +              - rgmii
 +              - rgmii-rxid
 +              - rgmii-txid
 +              - rgmii-id
 +    then:
 +      properties:
 +        rx-internal-delay-ps:
 +          description:
 +            RGMII Receive Clock Delay defined in pico seconds.This is used for
 +            controllers that have configurable RX internal delays. If this
 +            property is present then the MAC applies the RX delay.
 +        tx-internal-delay-ps:
 +          description:
 +            RGMII Transmit Clock Delay defined in pico seconds.This is used for
 +            controllers that have configurable TX internal delays. If this
 +            property is present then the MAC applies the TX delay.
 +
  additionalProperties: true
  
  ...

diff --cc Documentation/devicetree/bindings/net/fsl,fec.yaml
Simple merge

diff --cc Documentation/networking/ip-sysctl.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/fungible/funeth/funeth_tx.c
Simple merge

diff --cc drivers/net/ethernet/fungible/funeth/funeth_txrx.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_sriov.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_virtchnl.c
Simple merge

diff --cc drivers/net/macsec.c
Simple merge

diff --cc drivers/net/pcs/pcs-xpcs.c
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc net/bluetooth/hci_sync.c
Simple merge

diff --cc net/bluetooth/l2cap_core.c
Simple merge

diff --cc net/bluetooth/mgmt.c
Simple merge

diff --cc net/bridge/br_netlink.c
Simple merge

diff --cc net/decnet/af_decnet.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv6/ping.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/mptcp/subflow.c
Simple merge

diff --cc net/tls/tls_device.c
Simple merge