Skip to content

Commit ee5b8e3

Browse files
kelsey-steelekelsey-steele
committed
Merge tag 'rolling-lts/wsl/5.15.146.1' into linux-msft-wsl-5.15.y
Linux rolling-lts/wsl/5.15.146.1 Signed-off-by: Kelsey Steele <[email protected]>
2 parents 7e60905 + c33f17e commit ee5b8e3

File tree

1,177 files changed

+14652
-8528
lines changed

Some content is hidden

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

1,177 files changed

+14652
-8528
lines changed

‎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: [email protected]
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/devicetree/bindings/nvmem/mxs-ocotp.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- fsl,imx23-ocotp
19-
- fsl,imx28-ocotp
17+
items:
18+
- enum:
19+
- fsl,imx23-ocotp
20+
- fsl,imx28-ocotp
21+
- const: fsl,ocotp
2022

2123
"#address-cells":
2224
const: 1
@@ -40,7 +42,7 @@ additionalProperties: false
4042
examples:
4143
- |
4244
ocotp: efuse@8002c000 {
43-
compatible = "fsl,imx28-ocotp";
45+
compatible = "fsl,imx28-ocotp", "fsl,ocotp";
4446
#address-cells = <1>;
4547
#size-cells = <1>;
4648
reg = <0x8002c000 0x2000>;

‎Documentation/process/howto.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ experience, the following books are good for, if anything, reference:
3636
- "C: A Reference Manual" by Harbison and Steele [Prentice Hall]
3737

3838
The kernel is written using GNU C and the GNU toolchain. While it
39-
adheres to the ISO C89 standard, it uses a number of extensions that are
39+
adheres to the ISO C11 standard, it uses a number of extensions that are
4040
not featured in the standard. The kernel is a freestanding C
4141
environment, with no reliance on the standard C library, so some
4242
portions of the C standard are not supported. Arbitrary long long

‎Documentation/translations/it_IT/process/howto.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ altro, utili riferimenti:
4444
- "C: A Reference Manual" di Harbison and Steele [Prentice Hall]
4545

4646
Il kernel è stato scritto usando GNU C e la toolchain GNU.
47-
Sebbene si attenga allo standard ISO C89, esso utilizza una serie di
47+
Sebbene si attenga allo standard ISO C11, esso utilizza una serie di
4848
estensioni che non sono previste in questo standard. Il kernel è un
4949
ambiente C indipendente, che non ha alcuna dipendenza dalle librerie
5050
C standard, così alcune parti del C standard non sono supportate.

‎Documentation/translations/ja_JP/howto.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Linux カーネル開発のやり方
6565
- 『新・詳説 C 言語 H&S リファレンス』 (サミュエル P ハービソン/ガイ L スティール共著 斉藤 信男監訳)[ソフトバンク]
6666

6767
カーネルは GNU C と GNU ツールチェインを使って書かれています。カーネル
68-
は ISO C89 仕様に準拠して書く一方で、標準には無い言語拡張を多く使って
68+
は ISO C11 仕様に準拠して書く一方で、標準には無い言語拡張を多く使って
6969
います。カーネルは標準 C ライブラリに依存しない、C 言語非依存環境です。
7070
そのため、C の標準の中で使えないものもあります。特に任意の long long
7171
の除算や浮動小数点は使えません。カーネルがツールチェインや C 言語拡張

‎Documentation/translations/ko_KR/howto.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Documentation/process/howto.rst
6262
- "Practical C Programming" by Steve Oualline [O'Reilly]
6363
- "C: A Reference Manual" by Harbison and Steele [Prentice Hall]
6464

65-
커널은 GNU C와 GNU 툴체인을 사용하여 작성되었다. 이 툴들은 ISO C89 표준을
65+
커널은 GNU C와 GNU 툴체인을 사용하여 작성되었다. 이 툴들은 ISO C11 표준을
6666
따르는 반면 표준에 있지 않은 많은 확장기능도 가지고 있다. 커널은 표준 C
6767
라이브러리와는 관계없이 freestanding C 환경이어서 C 표준의 일부는
6868
지원되지 않는다. 임의의 long long 나누기나 floating point는 지원되지 않는다.

‎Documentation/translations/zh_CN/process/howto.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Linux内核大部分是由C语言写成的，一些体系结构相关的代码
4545
- "C: A Reference Manual" by Harbison and Steele [Prentice Hall]
4646
《C语言参考手册（原书第5版）》（邱仲潘 等译）[机械工业出版社]
4747

48-
Linux内核使用GNU C和GNU工具链开发。虽然它遵循ISO C89标准，但也用到了一些
48+
Linux内核使用GNU C和GNU工具链开发。虽然它遵循ISO C11标准，但也用到了一些
4949
标准中没有定义的扩展。内核是自给自足的C环境，不依赖于标准C库的支持，所以
5050
并不支持C标准中的部分定义。比如long long类型的大数除法和浮点运算就不允许
5151
使用。有时候确实很难弄清楚内核对工具链的要求和它所使用的扩展，不幸的是目

‎Documentation/translations/zh_TW/process/howto.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Linux內核大部分是由C語言寫成的，一些體系結構相關的代碼
4848
- "C: A Reference Manual" by Harbison and Steele [Prentice Hall]
4949
《C語言參考手冊（原書第5版）》（邱仲潘 等譯）[機械工業出版社]
5050

51-
Linux內核使用GNU C和GNU工具鏈開發。雖然它遵循ISO C89標準，但也用到了一些
51+
Linux內核使用GNU C和GNU工具鏈開發。雖然它遵循ISO C11標準，但也用到了一些
5252
標準中沒有定義的擴展。內核是自給自足的C環境，不依賴於標準C庫的支持，所以
5353
並不支持C標準中的部分定義。比如long long類型的大數除法和浮點運算就不允許
5454
使用。有時候確實很難弄清楚內核對工具鏈的要求和它所使用的擴展，不幸的是目

‎MSFT-Merge/log‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
Name SHA1
22
---- ----
3-
config/wsl b2374d6060af2fbfd4ce3bf658e9653d971d7ac1
3+
config/wsl c032c38c9dea13cb1336ba454cb731f8cef5a68b
44
feature/arm64-hyperv-hypercall-interface/5.15 3e314b48254cb9c3eeac699356ac605193b4b6fa
55
feature/arm64-hyperv-synthetic-clocks-timers/5.15 59db35e760b9bacc8596a3660a12420f1fa5318f
6-
feature/dxgkrnl/5.15 26d29d8377a78f1b0014f6c9ba6df9ed5763f885
6+
feature/dxgkrnl/5.15 e8c50f197b62b147dbc3e3ee083dd1fbb66eaeaf
77
feature/hvlite_virtio_pmem/5.15 9194f84de8a58bc1a83125054286d649e35054be
88
feature/page-reporting/5.15 ad427234defd6cdfdc0c21ca5b64ef589b82a421
99
feature/vpci/5.15 92c970cf37ef2b7d159905ca9df9e25f86618248
1010
feature/memory-reclaim/5.15 fed46d1f99d22a5a9efd06da0bf5baf6a04045d8
1111
fix/vsock/5.15 c9e883dfbd7be1194e53133d888b435b277e2e5b
12+
fix/hv_utils_clock/5.15 ef0917a0635d92d4f4fb29d8a3efdf53d38f25e6
1213
product/wsl/readme/5.15 0e1ddcfdc9986e1bf420a3663011abd79752c642
1314
product/wsl/security/5.15 ab2488a9f10a3b83b958103c9b3ed728eb57c564

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 5
33
PATCHLEVEL = 15
4-
SUBLEVEL = 137
5-
EXTRAVERSION = .3
4+
SUBLEVEL = 146
5+
EXTRAVERSION = .1
66
NAME = Trick or Treat
77

88
# *DOCUMENTATION*

0 commit comments

Comments
 (0)