Commit bc88ba0c 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. No conflicts.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 285b2a46 6e27831b

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -213,7 +213,10 @@ Jeff Garzik <jgarzik@pretzel.yyz.us> 
Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>

Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>

Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>

Jens Axboe <axboe@suse.de>

Jens Axboe <axboe@kernel.dk> <axboe@suse.de>

Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>

Jens Axboe <axboe@kernel.dk> <axboe@fb.com>

Jens Axboe <axboe@kernel.dk> <axboe@meta.com>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>

Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>

Documentation/admin-guide/blockdev/nbd.rst

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ to borrow disk space from another computer. 
Unlike NFS, it is possible to put any filesystem on it, etc.



For more information, or to download the nbd-client and nbd-server

tools, go to http://nbd.sf.net/.

tools, go to https://github.com/NetworkBlockDevice/nbd.



The nbd kernel module need only be installed on the client

system, as the nbd-server is completely in userspace. In fact,

Documentation/devicetree/bindings/mailbox/mediatek,gce-mailbox.yaml

+12 −8
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ description: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - mediatek,mt6779-gce

          - mediatek,mt8173-gce

          - mediatek,mt8183-gce
@@ -24,6 +25,9 @@ properties: 
          - mediatek,mt8188-gce

          - mediatek,mt8192-gce

          - mediatek,mt8195-gce

      - items:

          - const: mediatek,mt6795-gce

          - const: mediatek,mt8173-gce



  "#mbox-cells":

    const: 2

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml

+16 −15
Original line number Diff line number Diff line
@@ -19,22 +19,15 @@ properties: 
      - items:

          - enum:

              - qcom,ipq5332-apcs-apps-global

              - qcom,ipq8074-apcs-apps-global

              - qcom,ipq9574-apcs-apps-global

          - const: qcom,ipq6018-apcs-apps-global

      - items:

          - enum:

              - qcom,ipq6018-apcs-apps-global

              - qcom,ipq8074-apcs-apps-global

              - qcom,msm8996-apcs-hmss-global

              - qcom,msm8998-apcs-hmss-global

              - qcom,qcm2290-apcs-hmss-global

              - qcom,sc7180-apss-shared

              - qcom,sc8180x-apss-shared

              - qcom,sdm660-apcs-hmss-global

              - qcom,sdm845-apss-shared

              - qcom,sm4250-apcs-hmss-global

              - qcom,sm6125-apcs-hmss-global

              - qcom,sm6115-apcs-hmss-global

              - qcom,sm8150-apss-shared

          - const: qcom,sdm845-apss-shared

      - items:

          - enum:

              - qcom,msm8916-apcs-kpss-global
@@ -45,6 +38,18 @@ properties: 
              - qcom,qcs404-apcs-apps-global

              - qcom,sdx55-apcs-gcc

          - const: syscon

      - enum:

          - qcom,ipq6018-apcs-apps-global

          - qcom,ipq8074-apcs-apps-global

          - qcom,msm8996-apcs-hmss-global

          - qcom,msm8998-apcs-hmss-global

          - qcom,qcm2290-apcs-hmss-global

          - qcom,sdm660-apcs-hmss-global

          - qcom,sdm845-apss-shared

          - qcom,sm4250-apcs-hmss-global

          - qcom,sm6115-apcs-hmss-global

          - qcom,sm6125-apcs-hmss-global



  reg:

    maxItems: 1
@@ -88,6 +93,7 @@ allOf: 
          items:

            - const: pll

            - const: aux



  - if:

      properties:

        compatible:
@@ -112,7 +118,6 @@ allOf: 
          contains:

            enum:

              - qcom,ipq6018-apcs-apps-global

              - qcom,ipq8074-apcs-apps-global

    then:

      properties:

        clocks:
@@ -134,14 +139,11 @@ allOf: 
            - qcom,msm8996-apcs-hmss-global

            - qcom,msm8998-apcs-hmss-global

            - qcom,qcm2290-apcs-hmss-global

            - qcom,sc7180-apss-shared

            - qcom,sc8180x-apss-shared

            - qcom,sdm660-apcs-hmss-global

            - qcom,sdm845-apss-shared

            - qcom,sm4250-apcs-hmss-global

            - qcom,sm6115-apcs-hmss-global

            - qcom,sm6125-apcs-hmss-global

            - qcom,sm8150-apss-shared

    then:

      properties:

        clocks: false
@@ -153,7 +155,6 @@ allOf: 
          contains:

            enum:

              - qcom,ipq6018-apcs-apps-global

              - qcom,ipq8074-apcs-apps-global

    then:

      properties:

        '#clock-cells':

Documentation/networking/bonding.rst

+5 −4
Original line number Diff line number Diff line
@@ -776,10 +776,11 @@ peer_notif_delay 
	Specify the delay, in milliseconds, between each peer

	notification (gratuitous ARP and unsolicited IPv6 Neighbor

	Advertisement) when they are issued after a failover event.

	This delay should be a multiple of the link monitor interval

	(arp_interval or miimon, whichever is active). The default

	value is 0 which means to match the value of the link monitor

	interval.

	This delay should be a multiple of the MII link monitor interval

	(miimon).



	The valid range is 0 - 300000. The default value is 0, which means

	to match the value of the MII link monitor interval.



prio

	Slave priority. A higher number means higher priority.