Commit af2d6148 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-rc7).

Conflicts:

Documentation/netlink/specs/ovpn.yaml
  880d43ca ("netlink: specs: clean up spaces in brackets")
  af52020f ("ovpn: reject unexpected netlink attributes")

drivers/net/phy/phy_device.c
  a44312d5 ("net: phy: Don't register LEDs for genphy")
  f0f2b992 ("net: phy: Don't register LEDs for genphy")
https://lore.kernel.org/20250710114926.7ec3a64f@kernel.org

drivers/net/wireless/intel/iwlwifi/fw/regulatory.c
drivers/net/wireless/intel/iwlwifi/mld/regulatory.c
  5fde0fcb ("wifi: iwlwifi: mask reserved bits in chan_state_active_bitmap")
  ea045a0d ("wifi: iwlwifi: add support for accepting raw DSM tables by firmware")

net/ipv6/mcast.c
  ae3264a2 ("ipv6: mcast: Delay put pmc->idev in mld_del_delrec()")
  a8594c95 ("ipv6: mcast: Avoid a duplicate pointer check in mld_del_delrec()")
https://lore.kernel.org/8cc52891-3653-4b03-a45e-05464fe495cf@kernel.org



No adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a96cee9b 6832a931

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com> 
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>

Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Kirill A. Shutemov <kas@kernel.org> <kirill.shutemov@linux.intel.com>

Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>

Documentation/admin-guide/cgroup-v2.rst

+0 −6
Original line number Diff line number Diff line
@@ -1732,12 +1732,6 @@ The following nested keys are defined. 
	  numa_hint_faults (npn)

		Number of NUMA hinting faults.



	  numa_task_migrated (npn)

		Number of task migration by NUMA balancing.



	  numa_task_swapped (npn)

		Number of task swap by NUMA balancing.



	  pgdemote_kswapd

		Number of pages demoted by kswapd.

Documentation/devicetree/bindings/clock/mediatek,mt8188-clock.yaml

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ properties: 
  '#clock-cells':

    const: 1



  '#reset-cells':

    const: 1



required:

  - compatible

  - reg

Documentation/netlink/specs/ovpn.yaml

+147 −6
Original line number Diff line number Diff line
@@ -160,6 +160,66 @@ attribute-sets: 
        name: link-tx-packets

        type: uint

        doc: Number of packets transmitted at the transport level

  -

    name: peer-new-input

    subset-of: peer

    attributes:

      -

        name: id

      -

        name: remote-ipv4

      -

        name: remote-ipv6

      -

        name: remote-ipv6-scope-id

      -

        name: remote-port

      -

        name: socket

      -

        name: vpn-ipv4

      -

        name: vpn-ipv6

      -

        name: local-ipv4

      -

        name: local-ipv6

      -

        name: keepalive-interval

      -

        name: keepalive-timeout

  -

    name: peer-set-input

    subset-of: peer

    attributes:

      -

        name: id

      -

        name: remote-ipv4

      -

        name: remote-ipv6

      -

        name: remote-ipv6-scope-id

      -

        name: remote-port

      -

        name: vpn-ipv4

      -

        name: vpn-ipv6

      -

        name: local-ipv4

      -

        name: local-ipv6

      -

        name: keepalive-interval

      -

        name: keepalive-timeout

  -

    name: peer-del-input

    subset-of: peer

    attributes:

      -

        name: id

  -

    name: keyconf

    attributes:
@@ -216,6 +276,33 @@ attribute-sets: 
          obtain the actual cipher IV

        checks:

          exact-len: nonce-tail-size



  -

    name: keyconf-get

    subset-of: keyconf

    attributes:

      -

        name: peer-id

      -

        name: slot

      -

        name: key-id

      -

        name: cipher-alg

  -

    name: keyconf-swap-input

    subset-of: keyconf

    attributes:

      -

        name: peer-id

  -

    name: keyconf-del-input

    subset-of: keyconf

    attributes:

      -

        name: peer-id

      -

        name: slot

  -

    name: ovpn

    attributes:
@@ -235,12 +322,66 @@ attribute-sets: 
        type: nest

        doc: Peer specific cipher configuration

        nested-attributes: keyconf

  -

    name: ovpn-peer-new-input

    subset-of: ovpn

    attributes:

      -

        name: ifindex

      -

        name: peer

        nested-attributes: peer-new-input

  -

    name: ovpn-peer-set-input

    subset-of: ovpn

    attributes:

      -

        name: ifindex

      -

        name: peer

        nested-attributes: peer-set-input

  -

    name: ovpn-peer-del-input

    subset-of: ovpn

    attributes:

      -

        name: ifindex

      -

        name: peer

        nested-attributes: peer-del-input

  -

    name: ovpn-keyconf-get

    subset-of: ovpn

    attributes:

      -

        name: ifindex

      -

        name: keyconf

        nested-attributes: keyconf-get

  -

    name: ovpn-keyconf-swap-input

    subset-of: ovpn

    attributes:

      -

        name: ifindex

      -

        name: keyconf

        nested-attributes: keyconf-swap-input

  -

    name: ovpn-keyconf-del-input

    subset-of: ovpn

    attributes:

      -

        name: ifindex

      -

        name: keyconf

        nested-attributes: keyconf-del-input



operations:

  list:

    -

      name: peer-new

      attribute-set: ovpn

      attribute-set: ovpn-peer-new-input

      flags: [admin-perm]

      doc: Add a remote peer

      do:
@@ -252,7 +393,7 @@ operations: 
            - peer

    -

      name: peer-set

      attribute-set: ovpn

      attribute-set: ovpn-peer-set-input

      flags: [admin-perm]

      doc: modify a remote peer

      do:
@@ -286,7 +427,7 @@ operations: 
            - peer

    -

      name: peer-del

      attribute-set: ovpn

      attribute-set: ovpn-peer-del-input

      flags: [admin-perm]

      doc: Delete existing remote peer

      do:
@@ -316,7 +457,7 @@ operations: 
            - keyconf

    -

      name: key-get

      attribute-set: ovpn

      attribute-set: ovpn-keyconf-get

      flags: [admin-perm]

      doc: Retrieve non-sensitive data about peer key and cipher

      do:
@@ -331,7 +472,7 @@ operations: 
            - keyconf

    -

      name: key-swap

      attribute-set: ovpn

      attribute-set: ovpn-keyconf-swap-input

      flags: [admin-perm]

      doc: Swap primary and secondary session keys for a specific peer

      do:
@@ -350,7 +491,7 @@ operations: 
      mcgrp: peers

    -

      name: key-del

      attribute-set: ovpn

      attribute-set: ovpn-keyconf-del-input

      flags: [admin-perm]

      doc: Delete cipher key for a specific peer

      do:

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -10519,7 +10519,7 @@ S: Maintained 
F:	block/partitions/efi.*









HABANALABS PCI DRIVER









M:	Ofir Bitton <obitton@habana.ai>









M:	Yaron Avizrat <yaron.avizrat@intel.com>









L:	dri-devel@lists.freedesktop.org









S:	Supported









C:	irc://irc.oftc.net/dri-devel








@@ -26961,7 +26961,7 @@ F:	arch/x86/kernel/stacktrace.c







F:	arch/x86/kernel/unwind_*.c

















X86 TRUST DOMAIN EXTENSIONS (TDX)









M:	Kirill A. Shutemov <kirill.shutemov@linux.intel.com>









M:	Kirill A. Shutemov <kas@kernel.org>









R:	Dave Hansen <dave.hansen@linux.intel.com>









L:	x86@kernel.org









L:	linux-coco@lists.linux.dev