Commit 39f054a9 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To pick up fixes.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 8ff4f20f 2b14864a

.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/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:

Documentation/devicetree/bindings/net/ethernet-phy.yaml

+8 −0
Original line number Diff line number Diff line
@@ -91,6 +91,14 @@ properties: 
      compensate for the board being designed with the lanes

      swapped.



  enet-phy-lane-no-swap:

    $ref: /schemas/types.yaml#/definitions/flag

    description:

      If set, indicates that PHY will disable swap of the

      TX/RX lanes. This property allows the PHY to work correcly after

      e.g. wrong bootstrap configuration caused by issues in PCB

      layout design.



  eee-broken-100tx:

    $ref: /schemas/types.yaml#/definitions/flag

    description: