Commit 35eaa42c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.16-rc6 into tty-next 



We need the tty/serial fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 4b95391c a7904a53

.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/admin-guide/blockdev/drbd/figures.rst

+2 −2
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ Sub graphs of DRBD's state transitions 
    :alt:   disk-states-8.dot

    :align: center



.. kernel-figure:: node-states-8.dot

    :alt:   node-states-8.dot

.. kernel-figure:: peer-states-8.dot

    :alt:   peer-states-8.dot

    :align: center

Documentation/admin-guide/blockdev/drbd/node-states-8.dot→Documentation/admin-guide/blockdev/drbd/peer-states-8.dot

+0 −5
Original line number Diff line number Diff line 
digraph node_states {

	Secondary -> Primary           [ label = "ioctl_set_state()" ]

	Primary   -> Secondary 	       [ label = "ioctl_set_state()" ]

}



digraph peer_states {

	Secondary -> Primary           [ label = "recv state packet" ]

	Primary   -> Secondary 	       [ label = "recv state packet" ]

Documentation/conf.py

+10 −5
Original line number Diff line number Diff line
@@ -249,6 +249,11 @@ except ImportError: 


html_static_path = ['sphinx-static']



html_css_files = [

    'theme_overrides.css',

]



if major <= 1 and minor < 8:

    html_context = {

        'css_files': [

            '_static/theme_overrides.css',

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>;