Skip to content

Commit 603ea28

Browse files
committed
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: Greg Kroah-Hartman <[email protected]>
2 parents ea0efd6 + 4877846 commit 603ea28

File tree

453 files changed

+3944
-2616
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

453 files changed

+3944
-2616
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
What: /sys/bus/nd/devices/nmemX/papr/flags
2+
Date: Apr, 2020
3+
KernelVersion: v5.8
4+
Contact: linuxppc-dev <[email protected]>, [email protected],
5+
Description:
6+
(RO) Report flags indicating various states of a
7+
papr-pmem NVDIMM device. Each flag maps to a one or
8+
more bits set in the dimm-health-bitmap retrieved in
9+
response to H_SCM_HEALTH hcall. The details of the bit
10+
flags returned in response to this hcall is available
11+
at 'Documentation/powerpc/papr_hcalls.rst' . Below are
12+
the flags reported in this sysfs file:
13+
14+
* "not_armed" : Indicates that NVDIMM contents will not
15+
survive a power cycle.
16+
* "flush_fail" : Indicates that NVDIMM contents
17+
couldn't be flushed during last
18+
shut-down event.
19+
* "restore_fail": Indicates that NVDIMM contents
20+
couldn't be restored during NVDIMM
21+
initialization.
22+
* "encrypted" : NVDIMM contents are encrypted.
23+
* "smart_notify": There is health event for the NVDIMM.
24+
* "scrubbed" : Indicating that contents of the
25+
NVDIMM have been scrubbed.
26+
* "locked" : Indicating that NVDIMM contents cant
27+
be modified until next power cycle.

Documentation/arm64/sve.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ prctl(PR_SVE_SET_VL, unsigned long arg)
186186

187187
flags:
188188

189-
PR_SVE_SET_VL_INHERIT
189+
PR_SVE_VL_INHERIT
190190

191191
Inherit the current vector length across execve(). Otherwise, the
192192
vector length is reset to the system default at execve(). (See
@@ -247,7 +247,7 @@ prctl(PR_SVE_GET_VL)
247247

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

250-
PR_SVE_SET_VL_INHERIT
250+
PR_SVE_VL_INHERIT
251251

252252
Vector length will be inherited across execve().
253253

@@ -393,7 +393,7 @@ The regset data starts with struct user_sve_header, containing:
393393
* At every execve() call, the new vector length of the new process is set to
394394
the system default vector length, unless
395395

396-
* PR_SVE_SET_VL_INHERIT (or equivalently SVE_PT_VL_INHERIT) is set for the
396+
* PR_SVE_VL_INHERIT (or equivalently SVE_PT_VL_INHERIT) is set for the
397397
calling thread, or
398398

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ The bridge driver also has some helper functions it can use:
451451
"module_foo", "chipid", 0x36, NULL);
452452
453453
This loads the given module (can be ``NULL`` if no module needs to be loaded)
454-
and calls :c:func:`i2c_new_device` with the given ``i2c_adapter`` and
454+
and calls :c:func:`i2c_new_client_device` with the given ``i2c_adapter`` and
455455
chip/address arguments. If all goes well, then it registers the subdev with
456456
the v4l2_device.
457457

Documentation/filesystems/dax.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ size when creating the filesystem.
2525
Currently 3 filesystems support DAX: ext2, ext4 and xfs. Enabling DAX on them
2626
is different.
2727

28-
Enabling DAX on ext4 and ext2
28+
Enabling DAX on ext2
2929
-----------------------------
3030

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

3535

36-
Enabling DAX on xfs
37-
-------------------
36+
Enabling DAX on xfs and ext4
37+
----------------------------
3838

3939
Summary
4040
-------

Documentation/filesystems/ext4/verity.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@ is encrypted as well as the data itself.
3939

4040
Verity files cannot have blocks allocated past the end of the verity
4141
metadata.
42+
43+
Verity and DAX are not compatible and attempts to set both of these flags
44+
on a file will fail.

Documentation/gpu/amdgpu.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,14 @@ pp_power_profile_mode
197197
.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
198198
:doc: pp_power_profile_mode
199199

200-
busy_percent
201-
~~~~~~~~~~~~
200+
*_busy_percent
201+
~~~~~~~~~~~~~~
202202
203203
.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
204-
:doc: busy_percent
204+
:doc: gpu_busy_percent
205+
206+
.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
207+
:doc: mem_busy_percent
205208

206209
GPU Product Information
207210
=======================

Documentation/i2c/smbus-protocol.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ SMBus Quick Command
5757

5858
This sends a single bit to the device, at the place of the Rd/Wr bit::
5959

60-
A Addr Rd/Wr [A] P
60+
S Addr Rd/Wr [A] P
6161

6262
Functionality flag: I2C_FUNC_SMBUS_QUICK
6363

Documentation/powerpc/papr_hcalls.rst

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,51 @@ from the LPAR memory.
220220
**H_SCM_HEALTH**
221221

222222
| Input: drcIndex
223-
| Out: *health-bitmap, health-bit-valid-bitmap*
223+
| Out: *health-bitmap (r4), health-bit-valid-bitmap (r5)*
224224
| Return Value: *H_Success, H_Parameter, H_Hardware*
225225
226226
Given a DRC Index return the info on predictive failure and overall health of
227-
the NVDIMM. The asserted bits in the health-bitmap indicate a single predictive
228-
failure and health-bit-valid-bitmap indicate which bits in health-bitmap are
229-
valid.
227+
the PMEM device. The asserted bits in the health-bitmap indicate one or more states
228+
(described in table below) of the PMEM device and health-bit-valid-bitmap indicate
229+
which bits in health-bitmap are valid. The bits are reported in
230+
reverse bit ordering for example a value of 0xC400000000000000
231+
indicates bits 0, 1, and 5 are valid.
232+
233+
Health Bitmap Flags:
234+
235+
+------+-----------------------------------------------------------------------+
236+
| Bit | Definition |
237+
+======+=======================================================================+
238+
| 00 | PMEM device is unable to persist memory contents. |
239+
| | If the system is powered down, nothing will be saved. |
240+
+------+-----------------------------------------------------------------------+
241+
| 01 | PMEM device failed to persist memory contents. Either contents were |
242+
| | not saved successfully on power down or were not restored properly on |
243+
| | power up. |
244+
+------+-----------------------------------------------------------------------+
245+
| 02 | PMEM device contents are persisted from previous IPL. The data from |
246+
| | the last boot were successfully restored. |
247+
+------+-----------------------------------------------------------------------+
248+
| 03 | PMEM device contents are not persisted from previous IPL. There was no|
249+
| | data to restore from the last boot. |
250+
+------+-----------------------------------------------------------------------+
251+
| 04 | PMEM device memory life remaining is critically low |
252+
+------+-----------------------------------------------------------------------+
253+
| 05 | PMEM device will be garded off next IPL due to failure |
254+
+------+-----------------------------------------------------------------------+
255+
| 06 | PMEM device contents cannot persist due to current platform health |
256+
| | status. A hardware failure may prevent data from being saved or |
257+
| | restored. |
258+
+------+-----------------------------------------------------------------------+
259+
| 07 | PMEM device is unable to persist memory contents in certain conditions|
260+
+------+-----------------------------------------------------------------------+
261+
| 08 | PMEM device is encrypted |
262+
+------+-----------------------------------------------------------------------+
263+
| 09 | PMEM device has successfully completed a requested erase or secure |
264+
| | erase procedure. |
265+
+------+-----------------------------------------------------------------------+
266+
|10:63 | Reserved / Unused |
267+
+------+-----------------------------------------------------------------------+
230268

231269
**H_SCM_PERFORMANCE_STATS**
232270

Documentation/sh/index.rst

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@ Store Queue API
1616
.. kernel-doc:: arch/sh/kernel/cpu/sh4/sq.c
1717
:export:
1818

19-
SH-5
20-
----
21-
22-
TLB Interfaces
23-
~~~~~~~~~~~~~~
24-
25-
.. kernel-doc:: arch/sh/mm/tlb-sh5.c
26-
:internal:
27-
28-
.. kernel-doc:: arch/sh/include/asm/tlb_64.h
29-
:internal:
30-
3119
Machine Specific Interfaces
3220
===========================
3321

Documentation/userspace-api/media/conf_nitpick.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
("c:func", "copy_to_user"),
2828
("c:func", "determine_valid_ioctls"),
2929
("c:func", "ERR_PTR"),
30-
("c:func", "i2c_new_device"),
30+
("c:func", "i2c_new_client_device"),
3131
("c:func", "ioctl"),
3232
("c:func", "IS_ERR"),
3333
("c:func", "KERNEL_VERSION"),

0 commit comments

Comments
 (0)