Commit 46ae4d0a 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.

No conflicts (sort of) and no adjacent changes.

This merge reverts commit b3c9e65e ("net: hsr: remove seqnr_lock")
from net, as it was superseded by
commit 430d67bd ("net: hsr: Use the seqnr lock for frames received via interlink port.")
in net-next.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3cfb5aa1 5abfdfd4

Documentation/arch/riscv/vm-layout.rst

+0 −16
Original line number Diff line number Diff line
@@ -134,19 +134,3 @@ RISC-V Linux Kernel SV57 
   ffffffff00000000 |  -4     GB | ffffffff7fffffff |    2 GB | modules, BPF

   ffffffff80000000 |  -2     GB | ffffffffffffffff |    2 GB | kernel

  __________________|____________|__________________|_________|____________________________________________________________
 




Userspace VAs

--------------------

To maintain compatibility with software that relies on the VA space with a

maximum of 48 bits the kernel will, by default, return virtual addresses to

userspace from a 48-bit range (sv48). This default behavior is achieved by

passing 0 into the hint address parameter of mmap. On CPUs with an address space

smaller than sv48, the CPU maximum supported address space will be the default.



Software can "opt-in" to receiving VAs from another VA space by providing

a hint address to mmap. When a hint address is passed to mmap, the returned

address will never use more bits than the hint address. For example, if a hint

address of `1 << 40` is passed to mmap, a valid returned address will never use

bits 41 through 63. If no mappable addresses are available in that range, mmap

will return `MAP_FAILED`.

Documentation/devicetree/bindings/display/panel/wl-355608-a8.yaml→Documentation/devicetree/bindings/display/panel/anbernic,rg35xx-plus-panel.yaml

+11 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/panel/wl-355608-a8.yaml#

$id: http://devicetree.org/schemas/display/panel/anbernic,rg35xx-plus-panel.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: WL-355608-A8 3.5" (640x480 pixels) 24-bit IPS LCD panel

title: Anbernic RG35XX series (WL-355608-A8) 3.5" 640x480 24-bit IPS LCD panel



maintainers:

  - Ryan Walklin <ryan@testtoast.com>
@@ -15,7 +15,14 @@ allOf: 


properties:

  compatible:

    const: wl-355608-a8

    oneOf:

      - const: anbernic,rg35xx-plus-panel

      - items:

          - enum:

              - anbernic,rg35xx-2024-panel

              - anbernic,rg35xx-h-panel

              - anbernic,rg35xx-sp-panel

          - const: anbernic,rg35xx-plus-panel



  reg:

    maxItems: 1
@@ -40,7 +47,7 @@ examples: 
        #size-cells = <0>;



        panel@0 {

            compatible = "wl-355608-a8";

            compatible = "anbernic,rg35xx-plus-panel";

            reg = <0>;



            spi-3wire;

Documentation/devicetree/bindings/net/nxp,tja11xx.yaml

+46 −16
Original line number Diff line number Diff line
@@ -14,24 +14,38 @@ maintainers: 
description:

  Bindings for NXP TJA11xx automotive PHYs



properties:

  compatible:

    enum:

      - ethernet-phy-id0180.dc40

      - ethernet-phy-id0180.dc41

      - ethernet-phy-id0180.dc48

      - ethernet-phy-id0180.dd00

      - ethernet-phy-id0180.dd01

      - ethernet-phy-id0180.dd02

      - ethernet-phy-id0180.dc80

      - ethernet-phy-id0180.dc82

      - ethernet-phy-id001b.b010

      - ethernet-phy-id001b.b013

      - ethernet-phy-id001b.b030

      - ethernet-phy-id001b.b031



allOf:

  - $ref: ethernet-phy.yaml#



patternProperties:

  "^ethernet-phy@[0-9a-f]+$":

    type: object

    additionalProperties: false

    description: |

      Some packages have multiple PHYs. Secondary PHY should be defines as

      subnode of the first (parent) PHY.



  - if:

      properties:

      reg:

        minimum: 0

        maximum: 31

        description:

          The ID number for the child PHY. Should be +1 of parent PHY.

        compatible:

          contains:

            enum:

              - ethernet-phy-id0180.dc40

              - ethernet-phy-id0180.dc41

              - ethernet-phy-id0180.dc48

              - ethernet-phy-id0180.dd00

              - ethernet-phy-id0180.dd01

              - ethernet-phy-id0180.dd02



    then:

      properties:

        nxp,rmii-refclk-in:

          type: boolean

          description: |
@@ -48,6 +62,21 @@ patternProperties: 
            reference clock output when RMII mode enabled.

            Only supported on TJA1100 and TJA1101.



patternProperties:

  "^ethernet-phy@[0-9a-f]+$":

    type: object

    additionalProperties: false

    description: |

      Some packages have multiple PHYs. Secondary PHY should be defines as

      subnode of the first (parent) PHY.



    properties:

      reg:

        minimum: 0

        maximum: 31

        description:

          The ID number for the child PHY. Should be +1 of parent PHY.



    required:

      - reg
@@ -60,6 +89,7 @@ examples: 
        #size-cells = <0>;



        tja1101_phy0: ethernet-phy@4 {

            compatible = "ethernet-phy-id0180.dc40";

            reg = <0x4>;

            nxp,rmii-refclk-in;

        };

Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ unevaluatedProperties: false 


examples:

  - |

    nvmem {

    soc-nvmem {

        compatible = "xlnx,zynqmp-nvmem-fw";

        nvmem-layout {

            compatible = "fixed-layout";

Documentation/devicetree/bindings/soc/rockchip/grf.yaml

+9 −1
Original line number Diff line number Diff line
@@ -31,10 +31,16 @@ properties: 
              - rockchip,rk3588-pcie3-pipe-grf

              - rockchip,rk3588-usb-grf

              - rockchip,rk3588-usbdpphy-grf

              - rockchip,rk3588-vo-grf

              - rockchip,rk3588-vo0-grf

              - rockchip,rk3588-vo1-grf

              - rockchip,rk3588-vop-grf

              - rockchip,rv1108-usbgrf

          - const: syscon

      - items:

          - const: rockchip,rk3588-vo-grf

          - const: syscon

        deprecated: true

        description: Use rockchip,rk3588-vo{0,1}-grf instead.

      - items:

          - enum:

              - rockchip,px30-grf
@@ -262,6 +268,8 @@ allOf: 
          contains:

            enum:

              - rockchip,rk3588-vo-grf

              - rockchip,rk3588-vo0-grf

              - rockchip,rk3588-vo1-grf



    then:

      required: