Commit b6e39e48 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-7.0-rc8).

Conflicts:

net/ipv6/seg6_iptunnel.c
  c3812651 ("seg6: separate dst_cache for input and output paths in seg6 lwtunnel")
  78723a62 ("seg6: add per-route tunnel source address")
https://lore.kernel.org/adZhwtOYfo-0ImSa@sirena.org.uk

net/ipv4/icmp.c
  fde29fd9 ("ipv4: icmp: fix null-ptr-deref in icmp_build_probe()")
  d98adfbd ("ipv4: drop ipv6_stub usage and use direct function calls")
https://lore.kernel.org/adO3dccqnr6j-BL9@sirena.org.uk



Adjacent changes:

drivers/net/ethernet/stmicro/stmmac/chain_mode.c
  51f4e090 ("net: stmmac: fix integer underflow in chain mode")
  6b4286e0 ("net: stmmac: rename STMMAC_GET_ENTRY() -> STMMAC_NEXT_ENTRY()")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9700282a a55f7f5f

.get_maintainer.ignore

+1 −0
Original line number Diff line number Diff line 
Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>

Alyssa Rosenzweig <alyssa@rosenzweig.io>

Askar Safin <safinaskar@gmail.com>

Christoph Hellwig <hch@lst.de>

Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Marc Gonzalez <marc.w.gonzalez@free.fr>

Documentation/devicetree/bindings/connector/usb-connector.yaml

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ properties: 
    maxItems: 4



dependencies:

  pd-disable: [typec-power-opmode]

  sink-vdos-v1: [ sink-vdos ]

  sink-vdos: [ sink-vdos-v1 ]

Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml

+2 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ properties: 
      - const: core



  iommus:

    maxItems: 2

    maxItems: 1



  interconnects:

    items:
@@ -107,8 +107,7 @@ examples: 
        interconnect-names = "mdp0-mem",

                             "cpu-cfg";



        iommus = <&apps_smmu 0x420 0x2>,

                 <&apps_smmu 0x421 0x0>;

        iommus = <&apps_smmu 0x420 0x2>;

        ranges;



        display-controller@5e01000 {

Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ properties: 
    const: 2



  "#interrupt-cells":

    const: 1

    const: 2



  ngpios:

    description:
@@ -86,7 +86,7 @@ examples: 
        gpio-controller;

        #gpio-cells = <2>;

        interrupt-controller;

        #interrupt-cells = <1>;

        #interrupt-cells = <2>;

        interrupts = <53>, <53>, <53>, <53>,

                     <53>, <53>, <53>, <53>,

                     <53>, <53>, <53>, <53>,

Documentation/devicetree/bindings/media/qcom,qcm2290-venus.yaml

+2 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ properties: 
      - const: vcodec0_bus



  iommus:

    maxItems: 5

    maxItems: 2



  interconnects:

    maxItems: 2
@@ -102,10 +102,7 @@ examples: 
        memory-region = <&pil_video_mem>;



        iommus = <&apps_smmu 0x860 0x0>,

                 <&apps_smmu 0x880 0x0>,

                 <&apps_smmu 0x861 0x04>,

                 <&apps_smmu 0x863 0x0>,

                 <&apps_smmu 0x804 0xe0>;

                 <&apps_smmu 0x880 0x0>;



        interconnects = <&mmnrt_virt MASTER_VIDEO_P0 RPM_ALWAYS_TAG

                         &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,