Commit 385f186a 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.13-rc6).

No conflicts.

Adjacent changes:

include/linux/if_vlan.h
  f91a5b80 ("af_packet: fix vlan_get_protocol_dgram() vs MSG_PEEK")
  3f330db3 ("net: reformat kdoc return statements")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3fff5da4 aba74e63

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -735,6 +735,7 @@ Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de> 
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>

Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>

Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>

Yusuke Goda <goda.yusuke@renesas.com>

Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>

Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

Documentation/admin-guide/laptops/thinkpad-acpi.rst

+7 −3
Original line number Diff line number Diff line
@@ -445,8 +445,10 @@ event code Key Notes 
0x1008	0x07	FN+F8		IBM: toggle screen expand

				Lenovo: configure UltraNav,

				or toggle screen expand.

				On newer platforms (2024+)

				replaced by 0x131f (see below)

				On 2024 platforms replaced by

				0x131f (see below) and on newer

				platforms (2025 +) keycode is

				replaced by 0x1401 (see below).



0x1009	0x08	FN+F9		-
@@ -506,9 +508,11 @@ event code Key Notes 


0x1019	0x18	unknown



0x131f	...	FN+F8	        Platform Mode change.

0x131f	...	FN+F8		Platform Mode change (2024 systems).

				Implemented in driver.



0x1401	...	FN+F8		Platform Mode change (2025 + systems).

				Implemented in driver.

...	...	...



0x1020	0x1F	unknown

Documentation/admin-guide/pm/amd-pstate.rst

+1 −3
Original line number Diff line number Diff line
@@ -251,9 +251,7 @@ performance supported in `AMD CPPC Performance Capability <perf_cap_>`_). 
In some ASICs, the highest CPPC performance is not the one in the ``_CPC``

table, so we need to expose it to sysfs. If boost is not active, but

still supported, this maximum frequency will be larger than the one in

``cpuinfo``. On systems that support preferred core, the driver will have

different values for some cores than others and this will reflect the values

advertised by the platform at bootup.

``cpuinfo``.

This attribute is read-only.



``amd_pstate_lowest_nonlinear_freq``

Documentation/devicetree/bindings/crypto/fsl,sec-v4.0.yaml

+6 −4
Original line number Diff line number Diff line
@@ -114,8 +114,9 @@ patternProperties: 
          table that specifies the PPID to LIODN mapping. Needed if the PAMU is

          used.  Value is a 12 bit value where value is a LIODN ID for this JR.

          This property is normally set by boot firmware.

        $ref: /schemas/types.yaml#/definitions/uint32

        maximum: 0xfff

        $ref: /schemas/types.yaml#/definitions/uint32-array

        items:

          - maximum: 0xfff



  '^rtic@[0-9a-f]+$':

    type: object
@@ -186,8 +187,9 @@ patternProperties: 
              Needed if the PAMU is used.  Value is a 12 bit value where value

              is a LIODN ID for this JR. This property is normally set by boot

              firmware.

            $ref: /schemas/types.yaml#/definitions/uint32

            maximum: 0xfff

            $ref: /schemas/types.yaml#/definitions/uint32-array

            items:

              - maximum: 0xfff



          fsl,rtic-region:

            description:

Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ properties: 
  adi,dsi-lanes:

    description: Number of DSI data lanes connected to the DSI host.

    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [ 1, 2, 3, 4 ]

    enum: [ 2, 3, 4 ]



  "#sound-dai-cells":

    const: 0