Commit ec4c20ca 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.

Conflicts:

net/mac80211/rx.c
  91535613 ("wifi: mac80211: don't drop all unprotected public action frames")
  6c02fab7 ("wifi: mac80211: split ieee80211_drop_unencrypted_mgmt() return value")

Adjacent changes:

drivers/net/ethernet/apm/xgene/xgene_enet_main.c
  61471264 ("net: ethernet: apm: Convert to platform remove callback returning void")
  d2ca43f3 ("net: xgene: Fix unused xgene_enet_of_match warning for !CONFIG_OF")

net/vmw_vsock/virtio_transport.c
  64c99d2d ("vsock/virtio: support to send non-linear skb")
  53b08c49 ("vsock/virtio: initialize the_virtio_vsock before using VQs")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ef113733 c17cda15

.mailmap

+4 −2
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com> 
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Bartosz Golaszewski <brgl@bgdev.pl> <bgolaszewski@baylibre.com>

Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>

Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>

Ben Gardner <bgardner@wabtec.com>
@@ -450,9 +451,10 @@ Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com> 
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>

Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>

Oleksij Rempel <o.rempel@pengutronix.de>

Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>

Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>

Ondřej Jirman <megi@xff.cz> <megous@megous.com>

Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>

Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Documentation/devicetree/bindings/mmc/sdhci-msm.yaml

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ properties: 
    maxItems: 4



  clocks:

    minItems: 3

    minItems: 2

    items:

      - description: Main peripheral bus clock, PCLK/HCLK - AHB Bus clock

      - description: SDC MMC clock, MCLK

Documentation/devicetree/bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ examples: 


    phy@84000 {

        compatible = "qcom,ipq6018-qmp-pcie-phy";

        reg = <0x0 0x00084000 0x0 0x1000>;

        reg = <0x00084000 0x1000>;



        clocks = <&gcc GCC_PCIE0_AUX_CLK>,

                 <&gcc GCC_PCIE0_AHB_CLK>,

Documentation/devicetree/bindings/sound/cirrus,cs42l43.yaml

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ properties: 
    description:

      Current at which the headset micbias sense clamp will engage, 0 to

      disable.

    enum: [ 0, 14, 23, 41, 50, 60, 68, 86, 95 ]

    enum: [ 0, 14, 24, 43, 52, 61, 71, 90, 99 ]

    default: 0



  cirrus,bias-ramp-ms:

Documentation/rust/general-information.rst

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ target with the same invocation used for compilation, e.g.:: 


To read the docs locally in your web browser, run e.g.::



	xdg-open rust/doc/kernel/index.html

	xdg-open Documentation/output/rust/rustdoc/kernel/index.html



To learn about how to write the documentation, please see coding-guidelines.rst.