Commit 28aa52b6 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.16-rc4).

Conflicts:

Documentation/netlink/specs/mptcp_pm.yaml
  9e6dd4c2 ("netlink: specs: mptcp: replace underscores with dashes in names")
  ec362192 ("netlink: specs: fix up indentation errors")
https://lore.kernel.org/20250626122205.389c2cd4@canb.auug.org.au



Adjacent changes:

Documentation/netlink/specs/fou.yaml
  791a9ed0 ("netlink: specs: fou: replace underscores with dashes in names")
  880d43ca ("netlink: specs: clean up spaces in brackets")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5cfb2ac2 e34a79b9

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -2981,6 +2981,11 @@ S: 521 Pleasant Valley Road 
S: Potsdam, New York 13676

S: USA



N: Shannon Nelson

E: sln@onemain.com

D: Worked on several network drivers including

D: ixgbe, i40e, ionic, pds_core, pds_vdpa, pds_fwctl



N: Dave Neuer

E: dave.neuer@pobox.com

D: Helped implement support for Compaq's H31xx series iPAQs

Documentation/arch/arm64/booting.rst

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ Before jumping into the kernel, the following conditions must be met: 


  - If the kernel is entered at EL1:



      - ICC.SRE_EL2.Enable (bit 3) must be initialised to 0b1

      - ICC_SRE_EL2.Enable (bit 3) must be initialised to 0b1

      - ICC_SRE_EL2.SRE (bit 0) must be initialised to 0b1.



  - The DT or ACPI tables must describe a GICv3 interrupt controller.

Documentation/bpf/map_hash.rst

+7 −1
Original line number Diff line number Diff line
@@ -233,10 +233,16 @@ attempts in order to enforce the LRU property which have increasing impacts on 
other CPUs involved in the following operation attempts:



- Attempt to use CPU-local state to batch operations

- Attempt to fetch free nodes from global lists

- Attempt to fetch ``target_free`` free nodes from global lists

- Attempt to pull any node from a global list and remove it from the hashmap

- Attempt to pull any node from any CPU's list and remove it from the hashmap



The number of nodes to borrow from the global list in a batch, ``target_free``,

depends on the size of the map. Larger batch size reduces lock contention, but

may also exhaust the global structure. The value is computed at map init to

avoid exhaustion, by limiting aggregate reservation by all CPUs to half the map

size. With a minimum of a single element and maximum budget of 128 at a time.



This algorithm is described visually in the following diagram. See the

description in commit 3a08c2fd7634 ("bpf: LRU List") for a full explanation of

the corresponding operations:

Documentation/bpf/map_lru_hash_update.dot

+3 −3
Original line number Diff line number Diff line
@@ -35,18 +35,18 @@ digraph { 
  fn_bpf_lru_list_pop_free_to_local [shape=rectangle,fillcolor=2,

    label="Flush local pending,

    Rotate Global list, move

    LOCAL_FREE_TARGET

    target_free

    from global -> local"]

  // Also corresponds to:

  // fn__local_list_flush()

  // fn_bpf_lru_list_rotate()

  fn___bpf_lru_node_move_to_free[shape=diamond,fillcolor=2,

    label="Able to free\nLOCAL_FREE_TARGET\nnodes?"]

    label="Able to free\ntarget_free\nnodes?"]



  fn___bpf_lru_list_shrink_inactive [shape=rectangle,fillcolor=3,

    label="Shrink inactive list

      up to remaining

      LOCAL_FREE_TARGET

      target_free

      (global LRU -> local)"]

  fn___bpf_lru_list_shrink [shape=diamond,fillcolor=2,

    label="> 0 entries in\nlocal free list?"]

Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml

+23 −1
Original line number Diff line number Diff line
@@ -97,7 +97,10 @@ properties: 


  resets:

    items:

      - description: module reset

      - description:

          Module reset. This property is optional for controllers in Tegra194,

          Tegra234 etc where an internal software reset is available as an

          alternative.



  reset-names:

    items:
@@ -116,6 +119,13 @@ properties: 
      - const: rx

      - const: tx



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



allOf:

  - $ref: /schemas/i2c/i2c-controller.yaml

  - if:
@@ -169,6 +179,18 @@ allOf: 
      properties:

        power-domains: false



  - if:

      not:

        properties:

          compatible:

            contains:

              enum:

                - nvidia,tegra194-i2c

    then:

      required:

        - resets

        - reset-names



unevaluatedProperties: false



examples: