Skip to content

Commit 8ef0ca4

Browse files
rafaeljwrafaeljw
committed
Merge back other thermal control material for 6.3.
* thermal: (734 commits) thermal: core: call put_device() only after device_register() fails Linux 6.2-rc4 kbuild: Fix CFI hash randomization with KASAN firmware: coreboot: Check size of table entry and use flex-array kallsyms: Fix scheduling with interrupts disabled in self-test ata: pata_cs5535: Don't build on UML lockref: stop doing cpu_relax in the cmpxchg loop x86/pci: Treat EfiMemoryMappedIO as reservation of ECAM space efi: tpm: Avoid READ_ONCE() for accessing the event log io_uring: lock overflowing for IOPOLL ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF iommu/mediatek-v1: Fix an error handling path in mtk_iommu_v1_probe() iommu/iova: Fix alloc iova overflows issue iommu: Fix refcount leak in iommu_device_claim_dma_owner iommu/arm-smmu-v3: Don't unregister on shutdown iommu/arm-smmu: Don't unregister on shutdown iommu/arm-smmu: Report IOMMU_CAP_CACHE_COHERENCY even betterer platform/x86: thinkpad_acpi: Fix profile mode display in AMT mode ALSA: usb-audio: Fix possible NULL pointer dereference in snd_usb_pcm_has_fixed_rate() platform/x86: int3472/discrete: Ensure the clk/power enable pins are in output mode ...
2 parents 763bd29 + a2c81dc commit 8ef0ca4

File tree

773 files changed

+12566
-7256
lines changed

Some content is hidden

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

773 files changed

+12566
-7256
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
*.o.*
4040
*.patch
4141
*.rmeta
42+
*.rpm
4243
*.rsi
4344
*.s
4445
*.so

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ Tony Luck <[email protected]>
422422
TripleX Chung <[email protected]> <[email protected]>
423423
TripleX Chung <[email protected]> <[email protected]>
424424
Tsuneo Yoshioka <[email protected]>
425+
Tudor Ambarus <[email protected]> <[email protected]>
425426
Tycho Andersen <[email protected]> <[email protected]>
426427
Tzung-Bi Shih <[email protected]> <[email protected]>
427428
Uwe Kleine-König <[email protected]>

‎Documentation/ABI/testing/debugfs-pktcdvd

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
What: /sys/kernel/debug/pktcdvd/pktcdvd[0-7]
2+
Date: Oct. 2006
3+
KernelVersion: 2.6.20
4+
Contact: Thomas Maier <[email protected]>
5+
Description:
6+
7+
The pktcdvd module (packet writing driver) creates
8+
these files in debugfs:
9+
10+
/sys/kernel/debug/pktcdvd/pktcdvd[0-7]/
11+
12+
==== ====== ====================================
13+
info 0444 Lots of driver statistics and infos.
14+
==== ====== ====================================
15+
16+
Example::
17+
18+
cat /sys/kernel/debug/pktcdvd/pktcdvd0/info

‎Documentation/ABI/testing/sysfs-class-pktcdvd

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
sysfs interface
2+
---------------
3+
The pktcdvd module (packet writing driver) creates the following files in the
4+
sysfs: (<devid> is in the format major:minor)
5+
6+
What: /sys/class/pktcdvd/add
7+
What: /sys/class/pktcdvd/remove
8+
What: /sys/class/pktcdvd/device_map
9+
Date: Oct. 2006
10+
KernelVersion: 2.6.20
11+
Contact: Thomas Maier <[email protected]>
12+
Description:
13+
14+
========== ==============================================
15+
add (WO) Write a block device id (major:minor) to
16+
create a new pktcdvd device and map it to the
17+
block device.
18+
19+
remove (WO) Write the pktcdvd device id (major:minor)
20+
to remove the pktcdvd device.
21+
22+
device_map (RO) Shows the device mapping in format:
23+
pktcdvd[0-7] <pktdevid> <blkdevid>
24+
========== ==============================================
25+
26+
27+
What: /sys/class/pktcdvd/pktcdvd[0-7]/dev
28+
What: /sys/class/pktcdvd/pktcdvd[0-7]/uevent
29+
Date: Oct. 2006
30+
KernelVersion: 2.6.20
31+
Contact: Thomas Maier <[email protected]>
32+
Description:
33+
dev: (RO) Device id
34+
35+
uevent: (WO) To send a uevent
36+
37+
38+
What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/packets_started
39+
What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/packets_finished
40+
What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_written
41+
What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_read
42+
What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_read_gather
43+
What: /sys/class/pktcdvd/pktcdvd[0-7]/stat/reset
44+
Date: Oct. 2006
45+
KernelVersion: 2.6.20
46+
Contact: Thomas Maier <[email protected]>
47+
Description:
48+
packets_started: (RO) Number of started packets.
49+
50+
packets_finished: (RO) Number of finished packets.
51+
52+
kb_written: (RO) kBytes written.
53+
54+
kb_read: (RO) kBytes read.
55+
56+
kb_read_gather: (RO) kBytes read to fill write packets.
57+
58+
reset: (WO) Write any value to it to reset
59+
pktcdvd device statistic values, like
60+
bytes read/written.
61+
62+
63+
What: /sys/class/pktcdvd/pktcdvd[0-7]/write_queue/size
64+
What: /sys/class/pktcdvd/pktcdvd[0-7]/write_queue/congestion_off
65+
What: /sys/class/pktcdvd/pktcdvd[0-7]/write_queue/congestion_on
66+
Date: Oct. 2006
67+
KernelVersion: 2.6.20
68+
Contact: Thomas Maier <[email protected]>
69+
Description:
70+
============== ================================================
71+
size (RO) Contains the size of the bio write queue.
72+
73+
congestion_off (RW) If bio write queue size is below this mark,
74+
accept new bio requests from the block layer.
75+
76+
congestion_on (RW) If bio write queue size is higher as this
77+
mark, do no longer accept bio write requests
78+
from the block layer and wait till the pktcdvd
79+
device has processed enough bio's so that bio
80+
write queue size is below congestion off mark.
81+
A value of <= 0 disables congestion control.
82+
============== ================================================
83+
84+
85+
Example:
86+
--------
87+
To use the pktcdvd sysfs interface directly, you can do::
88+
89+
# create a new pktcdvd device mapped to /dev/hdc
90+
echo "22:0" >/sys/class/pktcdvd/add
91+
cat /sys/class/pktcdvd/device_map
92+
# assuming device pktcdvd0 was created, look at stat's
93+
cat /sys/class/pktcdvd/pktcdvd0/stat/kb_written
94+
# print the device id of the mapped block device
95+
fgrep pktcdvd0 /sys/class/pktcdvd/device_map
96+
# remove device, using pktcdvd0 device id 253:0
97+
echo "253:0" >/sys/class/pktcdvd/remove

‎Documentation/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ stable kernels.
120120
+----------------+-----------------+-----------------+-----------------------------+
121121
| ARM | Cortex-A710 | #2224489 | ARM64_ERRATUM_2224489 |
122122
+----------------+-----------------+-----------------+-----------------------------+
123+
| ARM | Cortex-A715 | #2645198 | ARM64_ERRATUM_2645198 |
124+
+----------------+-----------------+-----------------+-----------------------------+
123125
| ARM | Cortex-X2 | #2119858 | ARM64_ERRATUM_2119858 |
124126
+----------------+-----------------+-----------------+-----------------------------+
125127
| ARM | Cortex-X2 | #2224489 | ARM64_ERRATUM_2224489 |

‎Documentation/conf.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ def have_command(cmd):
3131
# Get Sphinx version
3232
major, minor, patch = sphinx.version_info[:3]
3333

34+
#
35+
# Warn about older versions that we don't want to support for much
36+
# longer.
37+
#
38+
if (major < 2) or (major == 2 and minor < 4):
39+
print('WARNING: support for Sphinx < 2.4 will be removed soon.')
3440

3541
# If extensions (or modules to document with autodoc) are in another directory,
3642
# add these directories to sys.path here. If the directory is relative to the
@@ -339,7 +345,11 @@ def get_cline_version():
339345

340346
# Custom sidebar templates, maps document names to template names.
341347
# Note that the RTD theme ignores this
342-
html_sidebars = { '**': ["about.html", 'searchbox.html', 'localtoc.html', 'sourcelink.html']}
348+
html_sidebars = { '**': ['searchbox.html', 'localtoc.html', 'sourcelink.html']}
349+
350+
# about.html is available for alabaster theme. Add it at the front.
351+
if html_theme == 'alabaster':
352+
html_sidebars['**'].insert(0, 'about.html')
343353

344354
# Output file base name for HTML help builder.
345355
htmlhelp_basename = 'TheLinuxKerneldoc'

‎Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,17 @@ properties:
5454
- const: xo
5555
- const: alternate
5656

57+
interrupts:
58+
minItems: 1
59+
maxItems: 3
60+
61+
interrupt-names:
62+
minItems: 1
63+
items:
64+
- const: dcvsh-irq-0
65+
- const: dcvsh-irq-1
66+
- const: dcvsh-irq-2
67+
5768
'#freq-domain-cells':
5869
const: 1
5970

‎Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-aes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Atmel Advanced Encryption Standard (AES) HW cryptographic accelerator
99

1010
maintainers:
11-
- Tudor Ambarus <tudor.ambarus@microchip.com>
11+
- Tudor Ambarus <tudor.ambarus@linaro.org>
1212

1313
properties:
1414
compatible:

‎Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-sha.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Atmel Secure Hash Algorithm (SHA) HW cryptographic accelerator
99

1010
maintainers:
11-
- Tudor Ambarus <tudor.ambarus@microchip.com>
11+
- Tudor Ambarus <tudor.ambarus@linaro.org>
1212

1313
properties:
1414
compatible:

‎Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-tdes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Atmel Triple Data Encryption Standard (TDES) HW cryptographic accelerator
99

1010
maintainers:
11-
- Tudor Ambarus <tudor.ambarus@microchip.com>
11+
- Tudor Ambarus <tudor.ambarus@linaro.org>
1212

1313
properties:
1414
compatible:

0 commit comments

Comments
 (0)