Skip to content

Commit 9c3a0f2

Browse files
committed
Merge tag 'v5.14-rc4' into media_tree
Linux 5.14-rc4 * tag 'v5.14-rc4': (948 commits) Linux 5.14-rc4 pipe: make pipe writes always wake up readers Revert "perf map: Fix dso->nsinfo refcounting" mm/memcg: fix NULL pointer dereference in memcg_slab_free_hook() slub: fix unreclaimable slab stat for bulk free mm/migrate: fix NR_ISOLATED corruption on 64-bit mm: memcontrol: fix blocking rstat function called from atomic cgroup1 thresholding code ocfs2: issue zeroout to EOF blocks ocfs2: fix zero out valid data lib/test_string.c: move string selftest in the Runtime Testing menu gve: Update MAINTAINERS list arch: Kconfig: clean up obsolete use of HAVE_IDE can: esd_usb2: fix memory leak can: ems_usb: fix memory leak can: usb_8dev: fix memory leak can: mcba_usb_start(): add missing urb->transfer_dma initialization can: hi311x: fix a signedness bug in hi3110_cmd() MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver scsi: fas216: Fix fall-through warning for Clang scsi: acornscsi: Fix fall-through warning for clang ...
2 parents bfee75f + c500bee commit 9c3a0f2

File tree

953 files changed

+13101
-8520
lines changed

Some content is hidden

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

953 files changed

+13101
-8520
lines changed

Documentation/ABI/testing/sysfs-ptp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ Description:
3333
frequency adjustment value (a positive integer) in
3434
parts per billion.
3535

36+
What: /sys/class/ptp/ptpN/max_vclocks
37+
Date: May 2021
38+
Contact: Yangbo Lu <[email protected]>
39+
Description:
40+
This file contains the maximum number of ptp vclocks.
41+
Write integer to re-configure it.
42+
3643
What: /sys/class/ptp/ptpN/n_alarms
3744
Date: September 2010
3845
Contact: Richard Cochran <[email protected]>
@@ -61,6 +68,19 @@ Description:
6168
This file contains the number of programmable pins
6269
offered by the PTP hardware clock.
6370

71+
What: /sys/class/ptp/ptpN/n_vclocks
72+
Date: May 2021
73+
Contact: Yangbo Lu <[email protected]>
74+
Description:
75+
This file contains the number of virtual PTP clocks in
76+
use. By default, the value is 0 meaning that only the
77+
physical clock is in use. Setting the value creates
78+
the corresponding number of virtual clocks and causes
79+
the physical clock to become free running. Setting the
80+
value back to 0 deletes the virtual clocks and
81+
switches the physical clock back to normal, adjustable
82+
operation.
83+
6484
What: /sys/class/ptp/ptpN/pins
6585
Date: March 2014
6686
Contact: Richard Cochran <[email protected]>

Documentation/arm64/tagged-address-abi.rst

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,24 @@ how the user addresses are used by the kernel:
4545

4646
1. User addresses not accessed by the kernel but used for address space
4747
management (e.g. ``mprotect()``, ``madvise()``). The use of valid
48-
tagged pointers in this context is allowed with the exception of
49-
``brk()``, ``mmap()`` and the ``new_address`` argument to
50-
``mremap()`` as these have the potential to alias with existing
51-
user addresses.
52-
53-
NOTE: This behaviour changed in v5.6 and so some earlier kernels may
54-
incorrectly accept valid tagged pointers for the ``brk()``,
55-
``mmap()`` and ``mremap()`` system calls.
48+
tagged pointers in this context is allowed with these exceptions:
49+
50+
- ``brk()``, ``mmap()`` and the ``new_address`` argument to
51+
``mremap()`` as these have the potential to alias with existing
52+
user addresses.
53+
54+
NOTE: This behaviour changed in v5.6 and so some earlier kernels may
55+
incorrectly accept valid tagged pointers for the ``brk()``,
56+
``mmap()`` and ``mremap()`` system calls.
57+
58+
- The ``range.start``, ``start`` and ``dst`` arguments to the
59+
``UFFDIO_*`` ``ioctl()``s used on a file descriptor obtained from
60+
``userfaultfd()``, as fault addresses subsequently obtained by reading
61+
the file descriptor will be untagged, which may otherwise confuse
62+
tag-unaware programs.
63+
64+
NOTE: This behaviour changed in v5.14 and so some earlier kernels may
65+
incorrectly accept valid tagged pointers for this system call.
5666

5767
2. User addresses accessed by the kernel (e.g. ``write()``). This ABI
5868
relaxation is disabled by default and the application thread needs to

Documentation/dev-tools/kunit/running_tips.rst

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,7 @@ Generating code coverage reports under UML
8686
.. note::
8787
TODO([email protected]): There are various issues with UML and
8888
versions of gcc 7 and up. You're likely to run into missing ``.gcda``
89-
files or compile errors. We know one `faulty GCC commit
90-
<https://github.com/gcc-mirror/gcc/commit/8c9434c2f9358b8b8bad2c1990edf10a21645f9d>`_
91-
but not how we'd go about getting this fixed. The compile errors still
92-
need some investigation.
93-
94-
.. note::
95-
TODO([email protected]): for recent versions of Linux
96-
(5.10-5.12, maybe earlier), there's a bug with gcov counters not being
97-
flushed in UML. This translates to very low (<1%) reported coverage. This is
98-
related to the above issue and can be worked around by replacing the
99-
one call to ``uml_abort()`` (it's in ``os_dump_core()``) with a plain
100-
``exit()``.
101-
89+
files or compile errors.
10290

10391
This is different from the "normal" way of getting coverage information that is
10492
documented in Documentation/dev-tools/gcov.rst.

Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ properties:
5050

5151
reg:
5252
minItems: 1
53-
maxItems: 3
5453
items:
5554
- description: base register
5655
- description: power register

Documentation/devicetree/bindings/display/renesas,du.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ required:
9292
- reg
9393
- clocks
9494
- interrupts
95-
- resets
9695
- ports
9796

9897
allOf:

Documentation/devicetree/bindings/hwmon/adt7475.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,7 @@ properties:
3939
reg:
4040
maxItems: 1
4141

42-
patternProperties:
43-
"^adi,bypass-attenuator-in[0-4]$":
44-
description: |
45-
Configures bypassing the individual voltage input attenuator. If
46-
set to 1 the attenuator is bypassed if set to 0 the attenuator is
47-
not bypassed. If the property is absent then the attenuator
48-
retains it's configuration from the bios/bootloader.
49-
$ref: /schemas/types.yaml#/definitions/uint32
50-
enum: [0, 1]
51-
52-
"^adi,pwm-active-state$":
42+
adi,pwm-active-state:
5343
description: |
5444
Integer array, represents the active state of the pwm outputs If set to 0
5545
the pwm uses a logic low output for 100% duty cycle. If set to 1 the pwm
@@ -61,6 +51,16 @@ patternProperties:
6151
enum: [0, 1]
6252
default: 1
6353

54+
patternProperties:
55+
"^adi,bypass-attenuator-in[0-4]$":
56+
description: |
57+
Configures bypassing the individual voltage input attenuator. If
58+
set to 1 the attenuator is bypassed if set to 0 the attenuator is
59+
not bypassed. If the property is absent then the attenuator
60+
retains it's configuration from the bios/bootloader.
61+
$ref: /schemas/types.yaml#/definitions/uint32
62+
enum: [0, 1]
63+
6464
required:
6565
- compatible
6666
- reg

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,14 @@ properties:
5252
items:
5353
- const: marvell,ap806-smmu-500
5454
- const: arm,mmu-500
55-
- description: NVIDIA SoCs that program two ARM MMU-500s identically
56-
items:
5755
- description: NVIDIA SoCs that require memory controller interaction
5856
and may program multiple ARM MMU-500s identically with the memory
5957
controller interleaving translations between multiple instances
6058
for improved performance.
6159
items:
6260
- enum:
63-
- const: nvidia,tegra194-smmu
64-
- const: nvidia,tegra186-smmu
61+
- nvidia,tegra194-smmu
62+
- nvidia,tegra186-smmu
6563
- const: nvidia,smmu-500
6664
- items:
6765
- const: arm,mmu-500

Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@ properties:
2828
- description: configuration registers for MMU instance 0
2929
- description: configuration registers for MMU instance 1
3030
minItems: 1
31-
maxItems: 2
3231

3332
interrupts:
3433
items:
3534
- description: interruption for MMU instance 0
3635
- description: interruption for MMU instance 1
3736
minItems: 1
38-
maxItems: 2
3937

4038
clocks:
4139
items:

Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ properties:
5757

5858
ranges:
5959
minItems: 1
60-
maxItems: 3
6160
description: |
6261
Memory bus areas for interacting with the devices. Reflects
6362
the memory layout with four integer values following:

Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,13 @@ properties:
8484

8585
interrupts:
8686
minItems: 1
87-
maxItems: 3
8887
items:
8988
- description: NAND CTLRDY interrupt
9089
- description: FLASH_DMA_DONE if flash DMA is available
9190
- description: FLASH_EDU_DONE if EDU is available
9291

9392
interrupt-names:
9493
minItems: 1
95-
maxItems: 3
9694
items:
9795
- const: nand_ctlrdy
9896
- const: flash_dma_done
@@ -148,8 +146,6 @@ allOf:
148146
then:
149147
properties:
150148
reg-names:
151-
minItems: 2
152-
maxItems: 2
153149
items:
154150
- const: nand
155151
- const: nand-int-base
@@ -161,8 +157,6 @@ allOf:
161157
then:
162158
properties:
163159
reg-names:
164-
minItems: 3
165-
maxItems: 3
166160
items:
167161
- const: nand
168162
- const: nand-int-base
@@ -175,8 +169,6 @@ allOf:
175169
then:
176170
properties:
177171
reg-names:
178-
minItems: 3
179-
maxItems: 3
180172
items:
181173
- const: nand
182174
- const: iproc-idm

0 commit comments

Comments
 (0)