Commit 02df0832 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into efi/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 0679715e bef1d882

Documentation/dev-tools/kcov.rst

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



    struct kcov_remote_arg {

	unsigned	trace_mode;

	unsigned	area_size;

	unsigned	num_handles;

	uint64_t	common_handle;

	uint64_t	handles[0];

	__u32		trace_mode;

	__u32		area_size;

	__u32		num_handles;

	__aligned_u64	common_handle;

	__aligned_u64	handles[0];

    };



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

Documentation/dev-tools/kunit/start.rst

+5 −8
Original line number 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

: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

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.



.. code-block:: bash



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

	cd $PATH_TO_LINUX_REPO

	ln -s $PATH_TO_KUNIT_CONFIG_REPO/kunitconfig kunitconfig



You may want to add kunitconfig to your local gitignore.

	cp arch/um/configs/kunit_defconfig .kunitconfig



Verifying KUnit Works

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


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



Now add it to your ``kunitconfig``:

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



.. code-block:: none

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

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

        allOf:

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

          - enum: [ 1, 2, 4 ]

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

          - default: 1

        description:

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

        allOf:

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

          - enum: [ 1, 2, 4 ]

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

          - default: 1

        description:

          Bus width to the SPI bus used for MOSI.

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

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

    |      parisc: | TODO |

    |     powerpc: |  ok  |

    |       riscv: | TODO |

    |       riscv: |  ok  |

    |        s390: |  ok  |

    |          sh: |  ok  |

    |       sparc: | TODO |

Documentation/networking/dsa/sja1105.rst

+0 −6
Original line number Diff line number Diff line
@@ -230,12 +230,6 @@ simultaneously on two ports. The driver checks the consistency of the schedules 
against this restriction and errors out when appropriate. Schedule analysis is

needed to avoid this, which is outside the scope of the document.



At the moment, the time-aware scheduler can only be triggered based on a

standalone clock and not based on PTP time. This means the base-time argument

from tc-taprio is ignored and the schedule starts right away. It also means it

is more difficult to phase-align the scheduler with the other devices in the

network.



Device Tree bindings and board design

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