Commit 5d40b918 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.19-rc4 into char-misc-next 



We need the IIO fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 152520cb 03c765b0

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
# Please keep this list dictionary sorted.

#

Aaron Durbin <adurbin@google.com>

Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>

Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>

Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>

Adam Oldham <oldhamca@gmail.com>

Adam Radford <aradford@gmail.com>
@@ -85,6 +87,7 @@ Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com> 
Christian Brauner <brauner@kernel.org> <christian@brauner.io>

Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>

Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>

Christian Marangi <ansuelsmth@gmail.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
@@ -165,6 +168,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com> 
Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>

Documentation/ABI/testing/sysfs-bus-iio-vf610

+1 −1
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/conversion_mode

What:		/sys/bus/iio/devices/iio:deviceX/in_conversion_mode

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

Description:

Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml

+0 −1
Original line number Diff line number Diff line
@@ -47,6 +47,5 @@ examples: 
        clocks = <&clkcfg CLK_SPI0>;

        interrupt-parent = <&plic>;

        interrupts = <54>;

        spi-max-frequency = <25000000>;

    };

...

Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ examples: 
        pinctrl-names = "default";

        pinctrl-0 = <&qup_spi1_default>;

        interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>;

        spi-max-frequency = <50000000>;

        #address-cells = <1>;

        #size-cells = <0>;

    };

Documentation/devicetree/bindings/usb/generic-ehci.yaml

+2 −1
Original line number Diff line number Diff line
@@ -136,7 +136,8 @@ properties: 
      Phandle of a companion.



  phys:

    maxItems: 1

    minItems: 1

    maxItems: 3



  phy-names:

    const: usb