Commit cb6c82df authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v5.5-rc7' into perf/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 57388912 def9d278

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ Jacob Shin <Jacob.Shin@amd.com> 
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>

Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>

James Bottomley <jejb@mulgrave.(none)>

James Bottomley <jejb@titanic.il.steeleye.com>

James E Wilson <wilson@specifix.com>

Documentation/ABI/stable/sysfs-driver-mlxreg-io

+11 −2
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ Description: This file shows the system fans direction: 


		The files are read only.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/jtag_enable

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version



Date:		November 2018

KernelVersion:	5.0

Contact:	Vadim Pasternak <vadimpmellanox.com>

Description:	These files show with which CPLD versions have been burned

		on LED board.

		on LED or Gearbox board.



		The files are read only.
@@ -121,6 +121,15 @@ Description: These files show the system reset cause, as following: ComEx 


		The files are read only.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version

Date:		November 2018

KernelVersion:	5.0

Contact:	Vadim Pasternak <vadimpmellanox.com>

Description:	These files show with which CPLD versions have been burned

		on LED board.



		The files are read only.



Date:		June 2019

KernelVersion:	5.3

Contact:	Vadim Pasternak <vadimpmellanox.com>

Documentation/admin-guide/devices.txt

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ 
		182 = /dev/perfctr	Performance-monitoring counters

		183 = /dev/hwrng	Generic random number generator

		184 = /dev/cpu/microcode CPU microcode update interface

		186 = /dev/atomicps	Atomic shapshot of process state data

		186 = /dev/atomicps	Atomic snapshot of process state data

		187 = /dev/irnet	IrNET device

		188 = /dev/smbusbios	SMBus BIOS

		189 = /dev/ussp_ctl	User space serial port control

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