Commit 5dae7453 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.18-rc4 



Cross-merge BPF and other fixes after downstream PR.
No conflicts.

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents e6e10c51 6146a0f1

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ Alan Cox <alan@lxorguk.ukuu.org.uk> 
Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>

Aleksey Gorelov <aleksey_gorelov@phoenix.com>

Alex Williamson <alex@shazbot.org> <alex.williamson@redhat.com>

Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>

Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>

Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
@@ -643,6 +644,7 @@ Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com> 
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>

Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rae Moar <raemoar63@gmail.com> <rmoar@google.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -2036,6 +2036,10 @@ S: Botanicka' 68a 
S: 602 00 Brno

S: Czech Republic



N: Karsten Keil

E: isdn@linux-pingi.de

D: ISDN subsystem maintainer



N: Jakob Kemi

E: jakob.kemi@telia.com

D: V4L W9966 Webcam driver

Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml

+2 −2
Original line number Diff line number Diff line
@@ -180,9 +180,9 @@ allOf: 
    then:

      properties:

        reg:

          minItems: 2

          maxItems: 2

        reg-names:

          minItems: 2

          maxItems: 2

    else:

      properties:

        reg:

Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml

+3 −1
Original line number Diff line number Diff line
@@ -142,7 +142,9 @@ allOf: 
      required:

        - orientation-switch

    then:

      $ref: /schemas/usb/usb-switch.yaml#

      allOf:

        - $ref: /schemas/usb/usb-switch.yaml#

        - $ref: /schemas/usb/usb-switch-ports.yaml#



unevaluatedProperties: false

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ properties: 
          - enum:

              - qcom,qcs8300-qmp-ufs-phy

          - const: qcom,sa8775p-qmp-ufs-phy

      - items:

          - enum:

              - qcom,kaanapali-qmp-ufs-phy

          - const: qcom,sm8750-qmp-ufs-phy

      - enum:

          - qcom,msm8996-qmp-ufs-phy

          - qcom,msm8998-qmp-ufs-phy