Skip to content

Commit 67a1723

Browse files
committed
Merge tag 'v6.7-rc8' into locking/core, to pick up dependent changes
Pick up these commits from Linus's tree: b106bcf ("locking/osq_lock: Clarify osq_wait_next()") 563adbf ("locking/osq_lock: Clarify osq_wait_next() calling convention") 7c22309 ("locking/osq_lock: Move the definition of optimistic_spin_node into osq_lock.c") Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents a51749a + 610a9b8 commit 67a1723

1,542 files changed

Lines changed: 20220 additions & 14609 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
117117
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
118118
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
119119
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
120+
Chester Lin <chester62515@gmail.com> <clin@suse.com>
120121
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
121122
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
122123
Chris Lew <quic_clew@quicinc.com> <clew@codeaurora.org>
@@ -190,6 +191,10 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
190191
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
191192
Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
192193
Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
194+
Geliang Tang <geliang.tang@linux.dev> <geliang.tang@suse.com>
195+
Geliang Tang <geliang.tang@linux.dev> <geliangtang@xiaomi.com>
196+
Geliang Tang <geliang.tang@linux.dev> <geliangtang@gmail.com>
197+
Geliang Tang <geliang.tang@linux.dev> <geliangtang@163.com>
193198
Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>
194199
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
195200
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
@@ -265,6 +270,9 @@ Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
265270
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
266271
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
267272
Jilai Wang <quic_jilaiw@quicinc.com> <jilaiw@codeaurora.org>
273+
Jiri Kosina <jikos@kernel.org> <jikos@jikos.cz>
274+
Jiri Kosina <jikos@kernel.org> <jkosina@suse.cz>
275+
Jiri Kosina <jikos@kernel.org> <jkosina@suse.com>
268276
Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>
269277
Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>
270278
Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>
@@ -428,6 +436,7 @@ Muna Sinada <quic_msinada@quicinc.com> <msinada@codeaurora.org>
428436
Murali Nalajala <quic_mnalajal@quicinc.com> <mnalajal@codeaurora.org>
429437
Mythri P K <mythripk@ti.com>
430438
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
439+
Naoya Horiguchi <naoya.horiguchi@nec.com> <n-horiguchi@ah.jp.nec.com>
431440
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
432441
Neeraj Upadhyay <quic_neeraju@quicinc.com> <neeraju@codeaurora.org>
433442
Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>

CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2944,6 +2944,14 @@ D: IPX development and support
29442944
N: Venkatesh Pallipadi (Venki)
29452945
D: x86/HPET
29462946

2947+
N: Antti Palosaari
2948+
E: crope@iki.fi
2949+
D: Various DVB drivers
2950+
W: https://palosaari.fi/linux/
2951+
S: Yliopistokatu 1 D 513
2952+
S: FI-90570 Oulu
2953+
S: FINLAND
2954+
29472955
N: Kyungmin Park
29482956
E: kyungmin.park@samsung.com
29492957
D: Samsung S5Pv210 and Exynos4210 mobile platforms

Documentation/ABI/testing/sysfs-bus-optee-devices

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,12 @@ Description:
66
OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
77
matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
88
are free to create needed API under optee-ta-<uuid> directory.
9+
10+
What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
11+
Date: November 2023
12+
KernelVersion: 6.7
13+
Contact: op-tee@lists.trustedfirmware.org
14+
Description:
15+
Allows to distinguish whether an OP-TEE based TA/device requires user-space
16+
tee-supplicant to function properly or not. This attribute will be present for
17+
devices which depend on tee-supplicant to be running.

Documentation/ABI/testing/sysfs-class-led

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,6 @@ Description:
5959
brightness. Reading this file when no hw brightness change
6060
event has happened will return an ENODATA error.
6161

62-
What: /sys/class/leds/<led>/color
63-
Date: June 2023
64-
KernelVersion: 6.5
65-
Description:
66-
Color of the LED.
67-
68-
This is a read-only file. Reading this file returns the color
69-
of the LED as a string (e.g: "red", "green", "multicolor").
70-
7162
What: /sys/class/leds/<led>/trigger
7263
Date: March 2006
7364
KernelVersion: 2.6.17

Documentation/arch/loongarch/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,9 @@ Developer web site of Loongson and LoongArch (Software and Documentation):
375375

376376
Documentation of LoongArch ISA:
377377

378-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-CN.pdf (in Chinese)
378+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-CN.pdf (in Chinese)
379379

380-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-EN.pdf (in English)
380+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-EN.pdf (in English)
381381

382382
Documentation of LoongArch ELF psABI:
383383

Documentation/arch/x86/boot.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Protocol 2.14 BURNT BY INCORRECT COMMIT
7777
Protocol 2.15 (Kernel 5.5) Added the kernel_info and kernel_info.setup_type_max.
7878
============= ============================================================
7979

80-
.. note::
80+
.. note::
8181
The protocol version number should be changed only if the setup header
8282
is changed. There is no need to update the version number if boot_params
8383
or kernel_info are changed. Additionally, it is recommended to use

Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Analog Devices ADV7533/35 HDMI Encoders
99
maintainers:
1010
- Laurent Pinchart <laurent.pinchart@ideasonboard.com>
1111

12+
allOf:
13+
- $ref: /schemas/sound/dai-common.yaml#
14+
1215
description: |
1316
The ADV7533 and ADV7535 are HDMI audio and video transmitters
1417
compatible with HDMI 1.4 and DVI 1.0. They support color space
@@ -89,6 +92,9 @@ properties:
8992
$ref: /schemas/types.yaml#/definitions/uint32
9093
enum: [ 1, 2, 3, 4 ]
9194

95+
"#sound-dai-cells":
96+
const: 0
97+
9298
ports:
9399
description:
94100
The ADV7533/35 has two video ports and one audio port.

Documentation/devicetree/bindings/display/fsl,lcdif.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ properties:
5151
minItems: 1
5252

5353
interrupts:
54-
maxItems: 1
54+
items:
55+
- description: LCDIF DMA interrupt
56+
- description: LCDIF Error interrupt
57+
minItems: 1
5558

5659
power-domains:
5760
maxItems: 1
@@ -131,6 +134,21 @@ allOf:
131134
then:
132135
required:
133136
- power-domains
137+
- if:
138+
properties:
139+
compatible:
140+
contains:
141+
enum:
142+
- fsl,imx23-lcdif
143+
then:
144+
properties:
145+
interrupts:
146+
minItems: 2
147+
maxItems: 2
148+
else:
149+
properties:
150+
interrupts:
151+
maxItems: 1
134152

135153
examples:
136154
- |

Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ maintainers:
1010
- Chun-Kuang Hu <chunkuang.hu@kernel.org>
1111
- Philipp Zabel <p.zabel@pengutronix.de>
1212
- Jitao Shi <jitao.shi@mediatek.com>
13-
- Xinlei Lee <xinlei.lee@mediatek.com>
1413

1514
description: |
1615
The MediaTek DSI function block is a sink of the display subsystem and can

Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ properties:
4242
- lg,acx467akm-7
4343
# LG Corporation 7" WXGA TFT LCD panel
4444
- lg,ld070wx3-sl01
45+
# LG Corporation 5" HD TFT LCD panel
46+
- lg,lh500wx1-sd03
4547
# One Stop Displays OSD101T2587-53TS 10.1" 1920x1200 panel
4648
- osddisplays,osd101t2587-53ts
4749
# Panasonic 10" WUXGA TFT LCD panel

0 commit comments

Comments
 (0)