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

Merge 5.8-rc2 into usb-linus 



Felipe has based his patches on that tag, so update my usb-linus branch
to it as well so that I can pull his patches in here easier.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents ea0efd68 48778464

Documentation/ABI/testing/sysfs-bus-papr-pmem

0 → 100644
+27 −0
Original line number Diff line number Diff line 
What:		/sys/bus/nd/devices/nmemX/papr/flags

Date:		Apr, 2020

KernelVersion:	v5.8

Contact:	linuxppc-dev <linuxppc-dev@lists.ozlabs.org>, linux-nvdimm@lists.01.org,

Description:

		(RO) Report flags indicating various states of a

		papr-pmem NVDIMM device. Each flag maps to a one or

		more bits set in the dimm-health-bitmap retrieved in

		response to H_SCM_HEALTH hcall. The details of the bit

		flags returned in response to this hcall is available

		at 'Documentation/powerpc/papr_hcalls.rst' . Below are

		the flags reported in this sysfs file:



		* "not_armed"	: Indicates that NVDIMM contents will not

				  survive a power cycle.

		* "flush_fail"	: Indicates that NVDIMM contents

				  couldn't be flushed during last

				  shut-down event.

		* "restore_fail": Indicates that NVDIMM contents

				  couldn't be restored during NVDIMM

				  initialization.

		* "encrypted"	: NVDIMM contents are encrypted.

		* "smart_notify": There is health event for the NVDIMM.

		* "scrubbed"	: Indicating that contents of the

				  NVDIMM have been scrubbed.

		* "locked"	: Indicating that NVDIMM contents cant

				  be modified until next power cycle.

Documentation/arm64/sve.rst

+3 −3
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ prctl(PR_SVE_SET_VL, unsigned long arg) 


    flags:



	PR_SVE_SET_VL_INHERIT

	PR_SVE_VL_INHERIT



	    Inherit the current vector length across execve().  Otherwise, the

	    vector length is reset to the system default at execve().  (See
@@ -247,7 +247,7 @@ prctl(PR_SVE_GET_VL) 


    The following flag may be OR-ed into the result:



	PR_SVE_SET_VL_INHERIT

	PR_SVE_VL_INHERIT



	    Vector length will be inherited across execve().
@@ -393,7 +393,7 @@ The regset data starts with struct user_sve_header, containing: 
* At every execve() call, the new vector length of the new process is set to

  the system default vector length, unless



    * PR_SVE_SET_VL_INHERIT (or equivalently SVE_PT_VL_INHERIT) is set for the

    * PR_SVE_VL_INHERIT (or equivalently SVE_PT_VL_INHERIT) is set for the

      calling thread, or



    * a deferred vector length change is pending, established via the

Documentation/driver-api/media/v4l2-subdev.rst

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ The bridge driver also has some helper functions it can use: 
					"module_foo", "chipid", 0x36, NULL);



This loads the given module (can be ``NULL`` if no module needs to be loaded)

and calls :c:func:`i2c_new_device` with the given ``i2c_adapter`` and

and calls :c:func:`i2c_new_client_device` with the given ``i2c_adapter`` and

chip/address arguments. If all goes well, then it registers the subdev with

the v4l2_device.

Documentation/filesystems/dax.txt

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ size when creating the filesystem. 
Currently 3 filesystems support DAX: ext2, ext4 and xfs.  Enabling DAX on them

is different.



Enabling DAX on ext4 and ext2

Enabling DAX on ext2

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



When mounting the filesystem, use the "-o dax" option on the command line or
@@ -33,8 +33,8 @@ add 'dax' to the options in /etc/fstab. This works to enable DAX on all files 
within the filesystem.  It is equivalent to the '-o dax=always' behavior below.





Enabling DAX on xfs

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

Enabling DAX on xfs and ext4

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



Summary

-------

Documentation/filesystems/ext4/verity.rst

+3 −0
Original line number Diff line number Diff line
@@ -39,3 +39,6 @@ is encrypted as well as the data itself. 


Verity files cannot have blocks allocated past the end of the verity

metadata.



Verity and DAX are not compatible and attempts to set both of these flags

on a file will fail.