Commit d8ec1985 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Paolo Abeni:
 "Including fixes from bpf and netfilter.

  Current release - regressions:

   - gro: initialize network_offset in network layer

   - tcp: reduce accepted window in NEW_SYN_RECV state

  Current release - new code bugs:

   - eth: mlx5e: do not use ptp structure for tx ts stats when not
     initialized

   - eth: ice: check for unregistering correct number of devlink params

  Previous releases - regressions:

   - bpf: Allow delete from sockmap/sockhash only if update is allowed

   - sched: taprio: extend minimum interval restriction to entire cycle
     too

   - netfilter: ipset: add list flush to cancel_gc

   - ipv4: fix address dump when IPv4 is disabled on an interface

   - sock_map: avoid race between sock_map_close and sk_psock_put

   - eth: mlx5: use mlx5_ipsec_rx_status_destroy to correctly delete
     status rules

  Previous releases - always broken:

   - core: fix __dst_negative_advice() race

   - bpf:
       - fix multi-uprobe PID filtering logic
       - fix pkt_type override upon netkit pass verdict

   - netfilter: tproxy: bail out if IP has been disabled on the device

   - af_unix: annotate data-race around unix_sk(sk)->addr

   - eth: mlx5e: fix UDP GSO for encapsulated packets

   - eth: idpf: don't enable NAPI and interrupts prior to allocating Rx
     buffers

   - eth: i40e: fully suspend and resume IO operations in EEH case

   - eth: octeontx2-pf: free send queue buffers incase of leaf to inner

   - eth: ipvlan: dont Use skb->sk in ipvlan_process_v{4,6}_outbound"

* tag 'net-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (69 commits)
  netdev: add qstat for csum complete
  ipvlan: Dont Use skb->sk in ipvlan_process_v{4,6}_outbound
  net: ena: Fix redundant device NUMA node override
  ice: check for unregistering correct number of devlink params
  ice: fix 200G PHY types to link speed mapping
  i40e: Fully suspend and resume IO operations in EEH case
  i40e: factoring out i40e_suspend/i40e_resume
  e1000e: move force SMBUS near the end of enable_ulp function
  net: dsa: microchip: fix RGMII error in KSZ DSA driver
  ipv4: correctly iterate over the target netns in inet_dump_ifaddr()
  net: fix __dst_negative_advice() race
  nfc/nci: Add the inconsistency check between the input data length and count
  MAINTAINERS: dwmac: starfive: update Maintainer
  net/sched: taprio: extend minimum interval restriction to entire cycle too
  net/sched: taprio: make q->picos_per_byte available to fill_sched_entry()
  netfilter: nft_fib: allow from forward/input without iif selector
  netfilter: tproxy: bail out if IP has been disabled on the device
  netfilter: nft_payload: skbuff vlan metadata mangle support
  net: ti: icssg-prueth: Fix start counter for ft1 filter
  sock_map: avoid race between sock_map_close and sk_psock_put
  ...
parents 4a4be1ad 13c7c941

Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml

+9 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 


  managers:

    type: object

    additionalProperties: false

    description:

      List of the PD69208T4/PD69204T4/PD69208M PSE managers. Each manager

      have 4 or 8 physical ports according to the chip version. No need to
@@ -47,8 +48,9 @@ properties: 
      - "#size-cells"



    patternProperties:

      "^manager@0[0-9a-b]$":

      "^manager@[0-9a-b]$":

        type: object

        additionalProperties: false

        description:

          PD69208T4/PD69204T4/PD69208M PSE manager exposing 4 or 8 physical

          ports.
@@ -69,9 +71,14 @@ properties: 
        patternProperties:

          '^port@[0-7]$':

            type: object

            additionalProperties: false



            properties:

              reg:

                maxItems: 1



            required:

              - reg

            additionalProperties: false



        required:

          - reg

Documentation/devicetree/bindings/net/pse-pd/ti,tps23881.yaml

+18 −0
Original line number Diff line number Diff line
@@ -29,13 +29,31 @@ properties: 
      of the ports conversion matrix that establishes relationship between

      the logical ports and the physical channels.

    type: object

    additionalProperties: false



    properties:

      "#address-cells":

        const: 1



      "#size-cells":

        const: 0



    patternProperties:

      '^channel@[0-7]$':

        type: object

        additionalProperties: false



        properties:

          reg:

            maxItems: 1



        required:

          - reg



    required:

      - "#address-cells"

      - "#size-cells"



unevaluatedProperties: false



required:

Documentation/netlink/specs/netdev.yaml

+4 −0
Original line number Diff line number Diff line
@@ -349,6 +349,10 @@ attribute-sets: 
          Number of packets dropped due to transient lack of resources, such as

          buffer space, host descriptors etc.

        type: uint

      -

        name: rx-csum-complete

        doc: Number of packets that were marked as CHECKSUM_COMPLETE.

        type: uint

      -

        name: rx-csum-unnecessary

        doc: Number of packets that were marked as CHECKSUM_UNNECESSARY.

Documentation/process/maintainer-netdev.rst

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ preferably including links to previous postings, for example:: 
  The amount of mooing will depend on packet rate so should match

  the diurnal cycle quite well.



  Signed-of-by: Joe Defarmer <joe@barn.org>

  Signed-off-by: Joe Defarmer <joe@barn.org>

  ---

  v3:

    - add a note about time-of-day mooing fluctuation to the commit message

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -3854,6 +3854,7 @@ BPF JIT for ARM64 
M:	Daniel Borkmann <daniel@iogearbox.net>

M:	Alexei Starovoitov <ast@kernel.org>

M:	Puranjay Mohan <puranjay@kernel.org>

R:	Xu Kuohai <xukuohai@huaweicloud.com>

L:	bpf@vger.kernel.org

S:	Supported

F:	arch/arm64/net/
@@ -21316,7 +21317,7 @@ F: arch/riscv/boot/dts/starfive/ 








STARFIVE DWMAC GLUE LAYER









M:	Emil Renner Berthing <kernel@esmil.dk>









M:	Samin Guo <samin.guo@starfivetech.com>









M:	Minda Chen <minda.chen@starfivetech.com>









S:	Maintained









F:	Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml









F:	drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c