Commit 357660d7 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.14-rc5).

Conflicts:

drivers/net/ethernet/cadence/macb_main.c
  fa52f15c ("net: cadence: macb: Synchronize stats calculations")
  75696dd0 ("net: cadence: macb: Convert to get_stats64")
https://lore.kernel.org/20250224125848.68ee63e5@canb.auug.org.au



Adjacent changes:

drivers/net/ethernet/intel/ice/ice_sriov.c
  79990cf5 ("ice: Fix deinitializing VF in error path")
  a2031632 ("ice: simplify VF MSI-X managing")

net/ipv4/tcp.c
  18912c52 ("tcp: devmem: don't write truncated dmabuf CMSGs to userspace")
  297d389e ("net: prefix devmem specific helpers")

net/mptcp/subflow.c
  8668860b ("mptcp: reset when MPTCP opts are dropped after join")
  c3349a22 ("mptcp: consolidate subflow cleanup")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7fe03536 1e15510b

Documentation/arch/powerpc/cxl.rst

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Introduction 
    both access system memory directly and with the same effective

    addresses.



    **This driver is deprecated and will be removed in a future release.**



Hardware overview

=================
@@ -453,7 +454,7 @@ Sysfs Class 


    A cxl sysfs class is added under /sys/class/cxl to facilitate

    enumeration and tuning of the accelerators. Its layout is

    described in Documentation/ABI/testing/sysfs-class-cxl

    described in Documentation/ABI/obsolete/sysfs-class-cxl





Udev rules

Documentation/arch/x86/sva.rst

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ to cache translations for virtual addresses. The IOMMU driver uses the 
mmu_notifier() support to keep the device TLB cache and the CPU cache in

sync. When an ATS lookup fails for a virtual address, the device should

use the PRI in order to request the virtual address to be paged into the

CPU page tables. The device must use ATS again in order the fetch the

CPU page tables. The device must use ATS again in order to fetch the

translation before use.



Shared Hardware Workqueues
@@ -216,7 +216,7 @@ submitting work and processing completions. 


Single Root I/O Virtualization (SR-IOV) focuses on providing independent

hardware interfaces for virtualizing hardware. Hence, it's required to be

almost fully functional interface to software supporting the traditional

an almost fully functional interface to software supporting the traditional

BARs, space for interrupts via MSI-X, its own register layout.

Virtual Functions (VFs) are assisted by the Physical Function (PF)

driver.

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

+7 −1
Original line number Diff line number Diff line
@@ -53,11 +53,17 @@ properties: 
  reg:

    maxItems: 1



  power-controller:

    type: object



  reboot-mode:

    type: object



required:

  - compatible

  - reg



additionalProperties: true

additionalProperties: false



examples:

  - |

Documentation/devicetree/bindings/mtd/cdns,hp-nfc.yaml

+7 −1
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ properties: 
  clocks:

    maxItems: 1



  clock-names:

    items:

      - const: nf_clk



  dmas:

    maxItems: 1
@@ -51,6 +55,7 @@ required: 
  - reg-names

  - interrupts

  - clocks

  - clock-names



unevaluatedProperties: false
@@ -66,7 +71,8 @@ examples: 
        #address-cells = <1>;

        #size-cells = <0>;

        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&nf_clk>;

        clocks = <&clk>;

        clock-names = "nf_clk";

        cdns,board-delay-ps = <4830>;



        nand@0 {

Documentation/networking/strparser.rst

+8 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ Functions 
Callbacks

=========



There are six callbacks:

There are seven callbacks:



    ::
@@ -182,6 +182,13 @@ There are six callbacks: 
    the length of the message. skb->len - offset may be greater

    then full_len since strparser does not trim the skb.



    ::



	int (*read_sock)(struct strparser *strp, read_descriptor_t *desc,

                     sk_read_actor_t recv_actor);



    The read_sock callback is used by strparser instead of

    sock->ops->read_sock, if provided.

    ::



	int (*read_sock_done)(struct strparser *strp, int err);