Commit 845f0810 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.5-rc6 into usb-next 



We need the USB fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 585c91f4 b3a987b0

Documentation/dev-tools/kcov.rst

+5 −5
Original line number Original line Diff line number Diff line
@@ -251,11 +251,11 @@ selectively from different subsystems. 
.. code-block:: c

.. code-block:: c





    struct kcov_remote_arg {

    struct kcov_remote_arg {

	unsigned	trace_mode;

	__u32		trace_mode;

	unsigned	area_size;

	__u32		area_size;

	unsigned	num_handles;

	__u32		num_handles;

	uint64_t	common_handle;

	__aligned_u64	common_handle;

	uint64_t	handles[0];

	__aligned_u64	handles[0];

    };

    };





    #define KCOV_INIT_TRACE			_IOR('c', 1, unsigned long)

    #define KCOV_INIT_TRACE			_IOR('c', 1, unsigned long)

Documentation/dev-tools/kunit/start.rst

+5 −8
Original line number Original line Diff line number Diff line
@@ -24,19 +24,16 @@ The wrapper can be run with: 
For more information on this wrapper (also called kunit_tool) checkout the

For more information on this wrapper (also called kunit_tool) checkout the

:doc:`kunit-tool` page.

:doc:`kunit-tool` page.





Creating a kunitconfig

Creating a .kunitconfig

======================

=======================

The Python script is a thin wrapper around Kbuild. As such, it needs to be

The Python script is a thin wrapper around Kbuild. As such, it needs to be

configured with a ``kunitconfig`` file. This file essentially contains the

configured with a ``.kunitconfig`` file. This file essentially contains the

regular Kernel config, with the specific test targets as well.

regular Kernel config, with the specific test targets as well.





.. code-block:: bash

.. code-block:: bash





	git clone -b master https://kunit.googlesource.com/kunitconfig $PATH_TO_KUNITCONFIG_REPO

	cd $PATH_TO_LINUX_REPO

	cd $PATH_TO_LINUX_REPO

	ln -s $PATH_TO_KUNIT_CONFIG_REPO/kunitconfig kunitconfig

	cp arch/um/configs/kunit_defconfig .kunitconfig



You may want to add kunitconfig to your local gitignore.





Verifying KUnit Works

Verifying KUnit Works

---------------------

---------------------
@@ -151,7 +148,7 @@ and the following to ``drivers/misc/Makefile``: 




	obj-$(CONFIG_MISC_EXAMPLE_TEST) += example-test.o

	obj-$(CONFIG_MISC_EXAMPLE_TEST) += example-test.o





Now add it to your ``kunitconfig``:

Now add it to your ``.kunitconfig``:





.. code-block:: none

.. code-block:: none

Documentation/devicetree/bindings/i2c/i2c-at91.txt

+4 −2
Original line number Original line Diff line number Diff line
@@ -18,8 +18,10 @@ Optional properties: 
- dma-names: should contain "tx" and "rx".

- dma-names: should contain "tx" and "rx".

- atmel,fifo-size: maximum number of data the RX and TX FIFOs can store for FIFO

- atmel,fifo-size: maximum number of data the RX and TX FIFOs can store for FIFO

  capable I2C controllers.

  capable I2C controllers.

- i2c-sda-hold-time-ns: TWD hold time, only available for "atmel,sama5d4-i2c"

- i2c-sda-hold-time-ns: TWD hold time, only available for:

  and "atmel,sama5d2-i2c".

	"atmel,sama5d4-i2c",

	"atmel,sama5d2-i2c",

	"microchip,sam9x60-i2c".

- Child nodes conforming to i2c bus binding

- Child nodes conforming to i2c bus binding





Examples :

Examples :

Documentation/devicetree/bindings/spi/spi-controller.yaml

+2 −2
Original line number Original line Diff line number Diff line
@@ -111,7 +111,7 @@ patternProperties: 
      spi-rx-bus-width:

      spi-rx-bus-width:

        allOf:

        allOf:

          - $ref: /schemas/types.yaml#/definitions/uint32

          - $ref: /schemas/types.yaml#/definitions/uint32

          - enum: [ 1, 2, 4 ]

          - enum: [ 1, 2, 4, 8 ]

          - default: 1

          - default: 1

        description:

        description:

          Bus width to the SPI bus used for MISO.

          Bus width to the SPI bus used for MISO.
@@ -123,7 +123,7 @@ patternProperties: 
      spi-tx-bus-width:

      spi-tx-bus-width:

        allOf:

        allOf:

          - $ref: /schemas/types.yaml#/definitions/uint32

          - $ref: /schemas/types.yaml#/definitions/uint32

          - enum: [ 1, 2, 4 ]

          - enum: [ 1, 2, 4, 8 ]

          - default: 1

          - default: 1

        description:

        description:

          Bus width to the SPI bus used for MOSI.

          Bus width to the SPI bus used for MOSI.

Documentation/features/debug/gcov-profile-all/arch-support.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
    |    openrisc: | TODO |

    |    openrisc: | TODO |

    |      parisc: | TODO |

    |      parisc: | TODO |

    |     powerpc: |  ok  |

    |     powerpc: |  ok  |

    |       riscv: | TODO |

    |       riscv: |  ok  |

    |        s390: |  ok  |

    |        s390: |  ok  |

    |          sh: |  ok  |

    |          sh: |  ok  |

    |       sparc: | TODO |

    |       sparc: | TODO |