Skip to content

Commit 011b113

Browse files
author
Ingo Molnar
committed
Merge branch 'sched/urgent' into sched/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents d329605 + ddae0ca commit 011b113

File tree

1,104 files changed

+12729
-6646
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,104 files changed

+12729
-6646
lines changed

.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ root = true
55
[{*.{awk,c,dts,dtsi,dtso,h,mk,s,S},Kconfig,Makefile,Makefile.*}]
66
charset = utf-8
77
end_of_line = lf
8-
trim_trailing_whitespace = true
98
insert_final_newline = true
109
indent_style = tab
1110
indent_size = 8
1211

1312
[*.{json,py,rs}]
1413
charset = utf-8
1514
end_of_line = lf
16-
trim_trailing_whitespace = true
1715
insert_final_newline = true
1816
indent_style = space
1917
indent_size = 4
@@ -26,7 +24,6 @@ indent_size = 8
2624
[*.yaml]
2725
charset = utf-8
2826
end_of_line = lf
29-
trim_trailing_whitespace = unset
3027
insert_final_newline = true
3128
indent_style = space
3229
indent_size = 2

.mailmap

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>
7272
Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>
7373
André Almeida <andrealmeid@igalia.com> <andrealmeid@collabora.com>
7474
Andy Adamson <andros@citi.umich.edu>
75+
Andy Shevchenko <andy@kernel.org> <andy@smile.org.ua>
76+
Andy Shevchenko <andy@kernel.org> <ext-andriy.shevchenko@nokia.com>
7577
Anilkumar Kolli <quic_akolli@quicinc.com> <akolli@codeaurora.org>
7678
Anirudh Ghayal <quic_aghayal@quicinc.com> <aghayal@codeaurora.org>
7779
Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
@@ -217,6 +219,7 @@ Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com>
217219
Geliang Tang <geliang@kernel.org> <geliangtang@xiaomi.com>
218220
Geliang Tang <geliang@kernel.org> <geliangtang@gmail.com>
219221
Geliang Tang <geliang@kernel.org> <geliangtang@163.com>
222+
Geliang Tang <geliang@kernel.org> <tanggeliang@kylinos.cn>
220223
Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>
221224
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
222225
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
@@ -337,10 +340,11 @@ Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
337340
Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org>
338341
Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org>
339342
Kay Sievers <kay.sievers@vrfy.org>
340-
Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
341-
Kees Cook <keescook@chromium.org> <keescook@google.com>
342-
Kees Cook <keescook@chromium.org> <kees@outflux.net>
343-
Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
343+
Kees Cook <kees@kernel.org> <kees.cook@canonical.com>
344+
Kees Cook <kees@kernel.org> <keescook@chromium.org>
345+
Kees Cook <kees@kernel.org> <keescook@google.com>
346+
Kees Cook <kees@kernel.org> <kees@outflux.net>
347+
Kees Cook <kees@kernel.org> <kees@ubuntu.com>
344348
Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>
345349
Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>
346350
Kenneth W Chen <kenneth.w.chen@intel.com>
@@ -604,6 +608,7 @@ Simon Kelley <simon@thekelleys.org.uk>
604608
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>
605609
Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>
606610
Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>
611+
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
607612
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
608613
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
609614
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>

Documentation/admin-guide/LSM/tomoyo.rst

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel.
99

1010
LiveCD-based tutorials are available at
1111

12-
http://tomoyo.sourceforge.jp/1.8/ubuntu12.04-live.html
13-
http://tomoyo.sourceforge.jp/1.8/centos6-live.html
12+
https://tomoyo.sourceforge.net/1.8/ubuntu12.04-live.html
13+
https://tomoyo.sourceforge.net/1.8/centos6-live.html
1414

1515
Though these tutorials use non-LSM version of TOMOYO, they are useful for you
1616
to know what TOMOYO is.
@@ -21,45 +21,32 @@ How to enable TOMOYO?
2121
Build the kernel with ``CONFIG_SECURITY_TOMOYO=y`` and pass ``security=tomoyo`` on
2222
kernel's command line.
2323

24-
Please see http://tomoyo.osdn.jp/2.5/ for details.
24+
Please see https://tomoyo.sourceforge.net/2.6/ for details.
2525

2626
Where is documentation?
2727
=======================
2828

2929
User <-> Kernel interface documentation is available at
30-
https://tomoyo.osdn.jp/2.5/policy-specification/index.html .
30+
https://tomoyo.sourceforge.net/2.6/policy-specification/index.html .
3131

3232
Materials we prepared for seminars and symposiums are available at
33-
https://osdn.jp/projects/tomoyo/docs/?category_id=532&language_id=1 .
33+
https://sourceforge.net/projects/tomoyo/files/docs/ .
3434
Below lists are chosen from three aspects.
3535

3636
What is TOMOYO?
3737
TOMOYO Linux Overview
38-
https://osdn.jp/projects/tomoyo/docs/lca2009-takeda.pdf
38+
https://sourceforge.net/projects/tomoyo/files/docs/lca2009-takeda.pdf
3939
TOMOYO Linux: pragmatic and manageable security for Linux
40-
https://osdn.jp/projects/tomoyo/docs/freedomhectaipei-tomoyo.pdf
40+
https://sourceforge.net/projects/tomoyo/files/docs/freedomhectaipei-tomoyo.pdf
4141
TOMOYO Linux: A Practical Method to Understand and Protect Your Own Linux Box
42-
https://osdn.jp/projects/tomoyo/docs/PacSec2007-en-no-demo.pdf
42+
https://sourceforge.net/projects/tomoyo/files/docs/PacSec2007-en-no-demo.pdf
4343

4444
What can TOMOYO do?
4545
Deep inside TOMOYO Linux
46-
https://osdn.jp/projects/tomoyo/docs/lca2009-kumaneko.pdf
46+
https://sourceforge.net/projects/tomoyo/files/docs/lca2009-kumaneko.pdf
4747
The role of "pathname based access control" in security.
48-
https://osdn.jp/projects/tomoyo/docs/lfj2008-bof.pdf
48+
https://sourceforge.net/projects/tomoyo/files/docs/lfj2008-bof.pdf
4949

5050
History of TOMOYO?
5151
Realities of Mainlining
52-
https://osdn.jp/projects/tomoyo/docs/lfj2008.pdf
53-
54-
What is future plan?
55-
====================
56-
57-
We believe that inode based security and name based security are complementary
58-
and both should be used together. But unfortunately, so far, we cannot enable
59-
multiple LSM modules at the same time. We feel sorry that you have to give up
60-
SELinux/SMACK/AppArmor etc. when you want to use TOMOYO.
61-
62-
We hope that LSM becomes stackable in future. Meanwhile, you can use non-LSM
63-
version of TOMOYO, available at http://tomoyo.osdn.jp/1.8/ .
64-
LSM version of TOMOYO is a subset of non-LSM version of TOMOYO. We are planning
65-
to port non-LSM version's functionalities to LSM versions.
52+
https://sourceforge.net/projects/tomoyo/files/docs/lfj2008.pdf

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1921,6 +1921,28 @@
19211921
Format:
19221922
<bus_id>,<clkrate>
19231923

1924+
i2c_touchscreen_props= [HW,ACPI,X86]
1925+
Set device-properties for ACPI-enumerated I2C-attached
1926+
touchscreen, to e.g. fix coordinates of upside-down
1927+
mounted touchscreens. If you need this option please
1928+
submit a drivers/platform/x86/touchscreen_dmi.c patch
1929+
adding a DMI quirk for this.
1930+
1931+
Format:
1932+
<ACPI_HW_ID>:<prop_name>=<val>[:prop_name=val][:...]
1933+
Where <val> is one of:
1934+
Omit "=<val>" entirely Set a boolean device-property
1935+
Unsigned number Set a u32 device-property
1936+
Anything else Set a string device-property
1937+
1938+
Examples (split over multiple lines):
1939+
i2c_touchscreen_props=GDIX1001:touchscreen-inverted-x:
1940+
touchscreen-inverted-y
1941+
1942+
i2c_touchscreen_props=MSSL1680:touchscreen-size-x=1920:
1943+
touchscreen-size-y=1080:touchscreen-inverted-y:
1944+
firmware-name=gsl1680-vendor-model.fw:silead,home-button
1945+
19241946
i8042.debug [HW] Toggle i8042 debug mode
19251947
i8042.unmask_kbd_data
19261948
[HW] Enable printing of interrupt data from the KBD port
@@ -2170,12 +2192,6 @@
21702192
Format: 0 | 1
21712193
Default set by CONFIG_INIT_ON_FREE_DEFAULT_ON.
21722194

2173-
init_mlocked_on_free= [MM] Fill freed userspace memory with zeroes if
2174-
it was mlock'ed and not explicitly munlock'ed
2175-
afterwards.
2176-
Format: 0 | 1
2177-
Default set by CONFIG_INIT_MLOCKED_ON_FREE_DEFAULT_ON
2178-
21792195
init_pkru= [X86] Specify the default memory protection keys rights
21802196
register contents for all processes. 0x55555554 by
21812197
default (disallow access to all but pkey 0). Can

Documentation/admin-guide/mm/transhuge.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,11 +467,11 @@ anon_fault_fallback_charge
467467
instead falls back to using huge pages with lower orders or
468468
small pages even though the allocation was successful.
469469

470-
anon_swpout
470+
swpout
471471
is incremented every time a huge page is swapped out in one
472472
piece without splitting.
473473

474-
anon_swpout_fallback
474+
swpout_fallback
475475
is incremented if a huge page has to be split before swapout.
476476
Usually because failed to allocate some continuous swap space
477477
for the huge page.

Documentation/arch/riscv/uabi.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,6 @@ the extension, or may have deliberately removed it from the listing.
6565
Misaligned accesses
6666
-------------------
6767

68-
Misaligned accesses are supported in userspace, but they may perform poorly.
68+
Misaligned scalar accesses are supported in userspace, but they may perform
69+
poorly. Misaligned vector accesses are only supported if the Zicclsm extension
70+
is supported.

Documentation/cdrom/cdrom-standard.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ current *struct* is::
217217
int (*media_changed)(struct cdrom_device_info *, int);
218218
int (*tray_move)(struct cdrom_device_info *, int);
219219
int (*lock_door)(struct cdrom_device_info *, int);
220-
int (*select_speed)(struct cdrom_device_info *, int);
220+
int (*select_speed)(struct cdrom_device_info *, unsigned long);
221221
int (*get_last_session) (struct cdrom_device_info *,
222222
struct cdrom_multisession *);
223223
int (*get_mcn)(struct cdrom_device_info *, struct cdrom_mcn *);
@@ -396,7 +396,7 @@ action need be taken, and the return value should be 0.
396396

397397
::
398398

399-
int select_speed(struct cdrom_device_info *cdi, int speed)
399+
int select_speed(struct cdrom_device_info *cdi, unsigned long speed)
400400

401401
Some CD-ROM drives are capable of changing their head-speed. There
402402
are several reasons for changing the speed of a CD-ROM drive. Badly

Documentation/core-api/swiotlb.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ alignment larger than PAGE_SIZE.
192192

193193
Dynamic swiotlb
194194
---------------
195-
When CONFIG_DYNAMIC_SWIOTLB is enabled, swiotlb can do on-demand expansion of
195+
When CONFIG_SWIOTLB_DYNAMIC is enabled, swiotlb can do on-demand expansion of
196196
the amount of memory available for allocation as bounce buffers. If a bounce
197197
buffer request fails due to lack of available space, an asynchronous background
198198
task is kicked off to allocate memory from general system memory and turn it

Documentation/devicetree/bindings/arm/stm32/st,mlahb.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,10 @@ unevaluatedProperties: false
5454

5555
examples:
5656
- |
57-
mlahb: ahb@38000000 {
57+
ahb {
5858
compatible = "st,mlahb", "simple-bus";
5959
#address-cells = <1>;
6060
#size-cells = <1>;
61-
reg = <0x10000000 0x40000>;
6261
ranges;
6362
dma-ranges = <0x00000000 0x38000000 0x10000>,
6463
<0x10000000 0x10000000 0x60000>,

Documentation/devicetree/bindings/arm/sunxi.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ properties:
5757
- const: allwinner,sun8i-v3s
5858

5959
- description: Anbernic RG35XX (2024)
60-
- items:
60+
items:
6161
- const: anbernic,rg35xx-2024
6262
- const: allwinner,sun50i-h700
6363

6464
- description: Anbernic RG35XX Plus
65-
- items:
65+
items:
6666
- const: anbernic,rg35xx-plus
6767
- const: allwinner,sun50i-h700
6868

6969
- description: Anbernic RG35XX H
70-
- items:
70+
items:
7171
- const: anbernic,rg35xx-h
7272
- const: allwinner,sun50i-h700
7373

0 commit comments

Comments
 (0)