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

Merge 5.5-rc3 into usb-next



We need the USB fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents ea81896d 46cf053e
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
@@ -265,6 +266,7 @@ Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
+5 −5
Original line number Diff line number Diff line
What:		/sys/bus/platform/devices/MLNXBF04:00/driver/lifecycle_state
What:		/sys/bus/platform/devices/MLNXBF04:00/lifecycle_state
Date:		Oct 2019
KernelVersion:	5.5
Contact:	"Liming Sun <lsun@mellanox.com>"
@@ -10,7 +10,7 @@ Description:
		  GA Non-Secured - Non-Secure chip and not able to change state
		  RMA - Return Merchandise Authorization

What:		/sys/bus/platform/devices/MLNXBF04:00/driver/post_reset_wdog
What:		/sys/bus/platform/devices/MLNXBF04:00/post_reset_wdog
Date:		Oct 2019
KernelVersion:	5.5
Contact:	"Liming Sun <lsun@mellanox.com>"
@@ -19,7 +19,7 @@ Description:
		to reboot the chip and recover it to the old state if the new
		boot partition fails.

What:		/sys/bus/platform/devices/MLNXBF04:00/driver/reset_action
What:		/sys/bus/platform/devices/MLNXBF04:00/reset_action
Date:		Oct 2019
KernelVersion:	5.5
Contact:	"Liming Sun <lsun@mellanox.com>"
@@ -30,7 +30,7 @@ Description:
		  emmc - boot from the onchip eMMC
		  emmc_legacy - boot from the onchip eMMC in legacy (slow) mode

What:		/sys/bus/platform/devices/MLNXBF04:00/driver/second_reset_action
What:		/sys/bus/platform/devices/MLNXBF04:00/second_reset_action
Date:		Oct 2019
KernelVersion:	5.5
Contact:	"Liming Sun <lsun@mellanox.com>"
@@ -44,7 +44,7 @@ Description:
		  swap_emmc - swap the primary / secondary boot partition
		  none - cancel the action

What:		/sys/bus/platform/devices/MLNXBF04:00/driver/secure_boot_fuse_state
What:		/sys/bus/platform/devices/MLNXBF04:00/secure_boot_fuse_state
Date:		Oct 2019
KernelVersion:	5.5
Contact:	"Liming Sun <lsun@mellanox.com>"
+11 −8
Original line number Diff line number Diff line
@@ -181,14 +181,17 @@ When mounting an ext4 filesystem, the following option are accepted:
        system after its metadata has been committed to the journal.

  commit=nrsec	(*)
        Ext4 can be told to sync all its data and metadata every 'nrsec'
        seconds. The default value is 5 seconds.  This means that if you lose
        your power, you will lose as much as the latest 5 seconds of work (your
        filesystem will not be damaged though, thanks to the journaling).  This
        default value (or any low value) will hurt performance, but it's good
        for data-safety.  Setting it to 0 will have the same effect as leaving
        it at the default (5 seconds).  Setting it to very large values will
        improve performance.
        This setting limits the maximum age of the running transaction to
        'nrsec' seconds.  The default value is 5 seconds.  This means that if
        you lose your power, you will lose as much as the latest 5 seconds of
        metadata changes (your filesystem will not be damaged though, thanks
        to the journaling). This default value (or any low value) will hurt
        performance, but it's good for data-safety.  Setting it to 0 will have
        the same effect as leaving it at the default (5 seconds).  Setting it
        to very large values will improve performance.  Note that due to
        delayed allocation even older data can be lost on power failure since
        writeback of those data begins only after time set in
        /proc/sys/vm/dirty_expire_centisecs.

  barrier=<0|1(*)>, barrier(*), nobarrier
        This enables/disables the use of write barriers in the jbd code.
+4 −4
Original line number Diff line number Diff line
@@ -203,12 +203,12 @@ Test Module
Kselftest tests the kernel from userspace.  Sometimes things need
testing from within the kernel, one method of doing this is to create a
test module.  We can tie the module into the kselftest framework by
using a shell script test runner.  ``kselftest_module.sh`` is designed
using a shell script test runner.  ``kselftest/module.sh`` is designed
to facilitate this process.  There is also a header file provided to
assist writing kernel modules that are for use with kselftest:

- ``tools/testing/kselftest/kselftest_module.h``
- ``tools/testing/kselftest/kselftest_module.sh``
- ``tools/testing/kselftest/kselftest/module.sh``

How to use
----------
@@ -247,7 +247,7 @@ A bare bones test module might look like this:

   #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

   #include "../tools/testing/selftests/kselftest_module.h"
   #include "../tools/testing/selftests/kselftest/module.h"

   KSTM_MODULE_GLOBALS();

@@ -276,7 +276,7 @@ Example test script

    #!/bin/bash
    # SPDX-License-Identifier: GPL-2.0+
    $(dirname $0)/../kselftest_module.sh "foo" test_foo
    $(dirname $0)/../kselftest/module.sh "foo" test_foo


Test Harness
+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ KUnit - Unit Testing for the Linux Kernel

	start
	usage
	kunit-tool
	api/index
	faq

Loading