Commit ce8abf34 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'tai-for-tracing' into timers/core 

Pull in the NMI safe TAI accessor which was provided for the tracing tree
to prepare for further changes in this area.
parents fde33ca4 3dc6ffae

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -391,6 +391,10 @@ Uwe Kleine-König <ukleinek@strlen.de> 
Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Vasily Averin <vasily.averin@linux.dev> <vvs@virtuozzo.com>

Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org>

Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>

Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>

Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>

Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>

Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

Documentation/core-api/timekeeping.rst

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ Some additional variants exist for more specialized cases: 
.. c:function:: u64 ktime_get_mono_fast_ns( void )

		u64 ktime_get_raw_fast_ns( void )

		u64 ktime_get_boot_fast_ns( void )

		u64 ktime_get_tai_fast_ns( void )

		u64 ktime_get_real_fast_ns( void )



	These variants are safe to call from any context, including from

Documentation/dev-tools/kunit/start.rst

+8 −3
Original line number Diff line number Diff line
@@ -41,13 +41,18 @@ or ``VFAT_FS``. To run ``FAT_KUNIT_TEST``, the ``.kunitconfig`` has: 
	CONFIG_MSDOS_FS=y

	CONFIG_FAT_KUNIT_TEST=y



1. A good starting point for the ``.kunitconfig``, is the KUnit default

   config. Run the command:

1. A good starting point for the ``.kunitconfig`` is the KUnit default config.

   You can generate it by running:



.. code-block:: bash



	cd $PATH_TO_LINUX_REPO

	cp tools/testing/kunit/configs/default.config .kunitconfig

	tools/testing/kunit/kunit.py config

	cat .kunit/.kunitconfig



.. note ::

   ``.kunitconfig`` lives in the ``--build_dir`` used by kunit.py, which is

   ``.kunit`` by default.



.. note ::

   You may want to remove CONFIG_KUNIT_ALL_TESTS from the ``.kunitconfig`` as

Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ properties: 
          Video port for MIPI DPI output (panel or connector).



    required:

      - port@0

      - port@1



required:

Documentation/devicetree/bindings/display/bridge/toshiba,tc358762.yaml

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ properties: 
          Video port for MIPI DPI output (panel or connector).



    required:

      - port@0

      - port@1



required: