Skip to content

Commit

Permalink
Merge branch 'for-next' into for-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
tiwai committed Dec 22, 2022
2 parents b47068b + ee0b089 commit 2d78eb0
Show file tree
Hide file tree
Showing 2,072 changed files with 68,637 additions and 52,362 deletions.
4 changes: 3 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ Christoph Hellwig <[email protected]>
Colin Ian King <[email protected]> <[email protected]>
Corey Minyard <[email protected]>
Damian Hobson-Garcia <[email protected]>
Dan Carpenter <[email protected]> <[email protected]>
Daniel Borkmann <[email protected]> <[email protected]>
Daniel Borkmann <[email protected]> <[email protected]>
Daniel Borkmann <[email protected]> <[email protected]>
Expand Down Expand Up @@ -353,7 +354,8 @@ Peter Oruba <[email protected]>
Pratyush Anand <[email protected]> <[email protected]>
Praveen BP <[email protected]>
Punit Agrawal <[email protected]> <[email protected]>
Qais Yousef <[email protected]> <[email protected]>
Qais Yousef <[email protected]> <[email protected]>
Qais Yousef <[email protected]> <[email protected]>
Quentin Monnet <[email protected]> <[email protected]>
Quentin Perret <[email protected]> <[email protected]>
Rafael J. Wysocki <[email protected]> <[email protected]>
Expand Down
9 changes: 9 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,11 @@ S: Ottawa, Ontario
S: K1N 6Z9
S: CANADA

N: Vivien Didelot
E: [email protected]
D: DSA framework and MV88E6XXX driver
S: Montreal, Quebec, Canada

N: Jeff Dike
E: [email protected]
W: http://user-mode-linux.sourceforge.net
Expand Down Expand Up @@ -2447,6 +2452,10 @@ S: 482 Shadowgraph Dr.
S: San Jose, CA 95110
S: USA

N: Michal Marek
E: [email protected]
D: Kbuild Maintainer 2009-2017

N: Martin Mares
E: [email protected]
W: http://www.ucw.cz/~mj/
Expand Down
4 changes: 2 additions & 2 deletions Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Description: A collection of all the memory tiers allocated.


What: /sys/devices/virtual/memory_tiering/memory_tierN/
/sys/devices/virtual/memory_tiering/memory_tierN/nodes
/sys/devices/virtual/memory_tiering/memory_tierN/nodelist
Date: August 2022
Contact: Linux memory management mailing list <[email protected]>
Description: Directory with details of a specific memory tier
Expand All @@ -21,5 +21,5 @@ Description: Directory with details of a specific memory tier
A smaller value of N implies a higher (faster) memory tier in the
hierarchy.

nodes: NUMA nodes that are part of this memory tier.
nodelist: NUMA nodes that are part of this memory tier.

1 change: 0 additions & 1 deletion Documentation/admin-guide/acpi/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ the Linux ACPI support.
:maxdepth: 1

initrd_table_override
dsdt-override
ssdt-overlays
cppc_sysfs
fan_performance_states
4 changes: 4 additions & 0 deletions Documentation/admin-guide/device-mapper/verity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ root_hash_sig_key_desc <key_description>
also gain new certificates at run time if they are signed by a certificate
already in the secondary trusted keyring.

try_verify_in_tasklet
If verity hashes are in cache, verify data blocks in kernel tasklet instead
of workqueue. This option can reduce IO latency.

Theory of operation
===================

Expand Down
2 changes: 1 addition & 1 deletion Documentation/admin-guide/media/vivid.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,7 @@ instance. This setup would require the following commands:
$ v4l2-ctl -d2 -i2
$ v4l2-ctl -d2 -c horizontal_movement=4
$ v4l2-ctl -d1 --overlay=1
$ v4l2-ctl -d1 -c loop_video=1
$ v4l2-ctl -d0 -c loop_video=1
$ v4l2-ctl -d2 --stream-mmap --overlay=1
And from another console:
Expand Down
8 changes: 8 additions & 0 deletions Documentation/arm64/booting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,14 @@ Before jumping into the kernel, the following conditions must be met:
- SMCR_EL2.LEN must be initialised to the same value for all CPUs the
kernel will execute on.

- HWFGRTR_EL2.nTPIDR2_EL0 (bit 55) must be initialised to 0b01.

- HWFGWTR_EL2.nTPIDR2_EL0 (bit 55) must be initialised to 0b01.

- HWFGRTR_EL2.nSMPRI_EL1 (bit 54) must be initialised to 0b01.

- HWFGWTR_EL2.nSMPRI_EL1 (bit 54) must be initialised to 0b01.

For CPUs with the Scalable Matrix Extension FA64 feature (FEAT_SME_FA64)

- If EL3 is present:
Expand Down
38 changes: 37 additions & 1 deletion Documentation/arm64/cpu-feature-registers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ operation if the source belongs to the supported system register space.

The infrastructure emulates only the following system register space::

Op0=3, Op1=0, CRn=0, CRm=0,4,5,6,7
Op0=3, Op1=0, CRn=0, CRm=0,2,3,4,5,6,7

(See Table C5-6 'System instruction encodings for non-Debug System
register accesses' in ARMv8 ARM DDI 0487A.h, for the list of
Expand Down Expand Up @@ -293,6 +293,42 @@ infrastructure:
| WFXT | [3-0] | y |
+------------------------------+---------+---------+

10) MVFR0_EL1 - AArch32 Media and VFP Feature Register 0

+------------------------------+---------+---------+
| Name | bits | visible |
+------------------------------+---------+---------+
| FPDP | [11-8] | y |
+------------------------------+---------+---------+

11) MVFR1_EL1 - AArch32 Media and VFP Feature Register 1

+------------------------------+---------+---------+
| Name | bits | visible |
+------------------------------+---------+---------+
| SIMDFMAC | [31-28] | y |
+------------------------------+---------+---------+
| SIMDSP | [19-16] | y |
+------------------------------+---------+---------+
| SIMDInt | [15-12] | y |
+------------------------------+---------+---------+
| SIMDLS | [11-8] | y |
+------------------------------+---------+---------+

12) ID_ISAR5_EL1 - AArch32 Instruction Set Attribute Register 5

+------------------------------+---------+---------+
| Name | bits | visible |
+------------------------------+---------+---------+
| CRC32 | [19-16] | y |
+------------------------------+---------+---------+
| SHA2 | [15-12] | y |
+------------------------------+---------+---------+
| SHA1 | [11-8] | y |
+------------------------------+---------+---------+
| AES | [7-4] | y |
+------------------------------+---------+---------+


Appendix I: Example
-------------------
Expand Down
36 changes: 36 additions & 0 deletions Documentation/block/ublk.rst
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,42 @@ managing and controlling ublk devices with help of several control commands:
For retrieving device info via ``ublksrv_ctrl_dev_info``. It is the server's
responsibility to save IO target specific info in userspace.

- ``UBLK_CMD_START_USER_RECOVERY``

This command is valid if ``UBLK_F_USER_RECOVERY`` feature is enabled. This
command is accepted after the old process has exited, ublk device is quiesced
and ``/dev/ublkc*`` is released. User should send this command before he starts
a new process which re-opens ``/dev/ublkc*``. When this command returns, the
ublk device is ready for the new process.

- ``UBLK_CMD_END_USER_RECOVERY``

This command is valid if ``UBLK_F_USER_RECOVERY`` feature is enabled. This
command is accepted after ublk device is quiesced and a new process has
opened ``/dev/ublkc*`` and get all ublk queues be ready. When this command
returns, ublk device is unquiesced and new I/O requests are passed to the
new process.

- user recovery feature description

Two new features are added for user recovery: ``UBLK_F_USER_RECOVERY`` and
``UBLK_F_USER_RECOVERY_REISSUE``.

With ``UBLK_F_USER_RECOVERY`` set, after one ubq_daemon(ublk server's io
handler) is dying, ublk does not delete ``/dev/ublkb*`` during the whole
recovery stage and ublk device ID is kept. It is ublk server's
responsibility to recover the device context by its own knowledge.
Requests which have not been issued to userspace are requeued. Requests
which have been issued to userspace are aborted.

With ``UBLK_F_USER_RECOVERY_REISSUE`` set, after one ubq_daemon(ublk
server's io handler) is dying, contrary to ``UBLK_F_USER_RECOVERY``,
requests which have been issued to userspace are requeued and will be
re-issued to the new process after handling ``UBLK_CMD_END_USER_RECOVERY``.
``UBLK_F_USER_RECOVERY_REISSUE`` is designed for backends who tolerate
double-write since the driver may issue the same I/O request twice. It
might be useful to a read-only FS or a VM backend.

Data plane
----------

Expand Down
6 changes: 6 additions & 0 deletions Documentation/core-api/kernel-api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ Text Searching
CRC and Math Functions in Linux
===============================

Arithmetic Overflow Checking
----------------------------

.. kernel-doc:: include/linux/overflow.h
:internal:

CRC Functions
-------------

Expand Down
1 change: 1 addition & 0 deletions Documentation/dev-tools/kmsan.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ uninitialized in the local variable, as well as the stack where the value was
copied to another memory location before use.

A use of uninitialized value ``v`` is reported by KMSAN in the following cases:

- in a condition, e.g. ``if (v) { ... }``;
- in an indexing or pointer dereferencing, e.g. ``array[v]`` or ``*v``;
- when it is copied to userspace or hardware, e.g. ``copy_to_user(..., &v, ...)``;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ maintainers:
- Neil Armstrong <[email protected]>

allOf:
- $ref: /schemas/sound/name-prefix.yaml#
- $ref: /schemas/sound/dai-common.yaml#

description: |
The Amlogic Meson Synopsys Designware Integration is composed of
Expand Down
29 changes: 21 additions & 8 deletions Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,22 @@ description:

properties:
compatible:
enum:
- qcom,sfpb-mutex
- qcom,tcsr-mutex
oneOf:
- enum:
- qcom,sfpb-mutex
- qcom,tcsr-mutex
- items:
- enum:
- qcom,apq8084-tcsr-mutex
- qcom,ipq6018-tcsr-mutex
- qcom,msm8226-tcsr-mutex
- qcom,msm8994-tcsr-mutex
- const: qcom,tcsr-mutex
- items:
- enum:
- qcom,msm8974-tcsr-mutex
- const: qcom,tcsr-mutex
- const: syscon

reg:
maxItems: 1
Expand All @@ -34,9 +47,9 @@ additionalProperties: false

examples:
- |
tcsr_mutex: hwlock@1f40000 {
compatible = "qcom,tcsr-mutex";
reg = <0x01f40000 0x40000>;
#hwlock-cells = <1>;
};
hwlock@1f40000 {
compatible = "qcom,tcsr-mutex";
reg = <0x01f40000 0x40000>;
#hwlock-cells = <1>;
};
...
5 changes: 4 additions & 1 deletion Documentation/devicetree/bindings/input/goodix,gt7375p.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ description:

properties:
compatible:
items:
oneOf:
- const: goodix,gt7375p
- items:
- const: goodix,gt7986u
- const: goodix,gt7375p

reg:
enum:
Expand Down

This file was deleted.

47 changes: 47 additions & 0 deletions Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/media/i2c/dongwoon,dw9714.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Dongwoon Anatech DW9714 camera voice coil lens driver

maintainers:
- Krzysztof Kozlowski <[email protected]>

description:
DW9174 is a 10-bit DAC with current sink capability. It is intended for
driving voice coil lenses in camera modules.

properties:
compatible:
const: dongwoon,dw9714

reg:
maxItems: 1

powerdown-gpios:
description:
XSD pin for shutdown (active low)

vcc-supply:
description: VDD power supply

required:
- compatible
- reg

additionalProperties: false

examples:
- |
i2c {
#address-cells = <1>;
#size-cells = <0>;
camera-lens@c {
compatible = "dongwoon,dw9714";
reg = <0x0c>;
vcc-supply = <&reg_csi_1v8>;
};
};
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/net/engleder,tsnep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ properties:

nvmem-cells: true

nvmem-cells-names: true
nvmem-cell-names: true

phy-connection-type:
enum:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ title: Samsung S3FWRN5 NCI NFC Controller

maintainers:
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Opasiak <[email protected]>

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,6 @@ patternProperties:
slew-rate:
enum: [0, 1]

output-enable:
description:
This will internally disable the tri-state for MIO pins.

drive-strength:
description:
Selects the drive strength for MIO pins, in mA.
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/power/fsl,imx-gpcv2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ properties:

power-supply: true

power-domains:
maxItems: 1

resets:
description: |
A number of phandles to resets that need to be asserted during
Expand Down
Loading

0 comments on commit 2d78eb0

Please sign in to comment.