Commit 7cd2802d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



No conflicts.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0f473bb6 6441998e

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ Greg Kroah-Hartman <gregkh@suse.de> 
Greg Kroah-Hartman <greg@kroah.com>

Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>

Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>

Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>

Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Documentation/devicetree/bindings/i2c/apple,i2c.yaml

+4 −4
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ allOf: 


properties:

  compatible:

    enum:

      - apple,t8103-i2c

      - apple,i2c

    items:

      - const: apple,t8103-i2c

      - const: apple,i2c



  reg:

    maxItems: 1
@@ -51,7 +51,7 @@ unevaluatedProperties: false 
examples:

  - |

    i2c@35010000 {

      compatible = "apple,t8103-i2c";

      compatible = "apple,t8103-i2c", "apple,i2c";

      reg = <0x35010000 0x4000>;

      interrupt-parent = <&aic>;

      interrupts = <0 627 4>;

Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ examples: 
        samsung,syscon-phandle = <&pmu_system_controller>;



        /* NTC thermistor is a hwmon device */

        ncp15wb473 {

        thermistor {

            compatible = "murata,ncp15wb473";

            pullup-uv = <1800000>;

            pullup-ohm = <47000>;

Documentation/devicetree/bindings/input/gpio-keys.yaml

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ examples: 
        down {

            label = "GPIO Key DOWN";

            linux,code = <108>;

            interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

            interrupts = <1 IRQ_TYPE_EDGE_FALLING>;

        };

    };

Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml

+2 −12
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ properties: 


            properties:

              data-lanes:

                description:

                  Note that 'fsl,imx7-mipi-csi2' only supports up to 2 data lines.

                items:

                  minItems: 1

                  maxItems: 4
@@ -91,18 +93,6 @@ properties: 
            required:

              - data-lanes



            allOf:

              - if:

                  properties:

                    compatible:

                      contains:

                        const: fsl,imx7-mipi-csi2

                then:

                  properties:

                    data-lanes:

                      items:

                        maxItems: 2



      port@1:

        $ref: /schemas/graph.yaml#/properties/port

        description: