Skip to content

Commit c5fb51b

Browse files
committed
Merge remote-tracking branch 'pm/opp/linux-next' into HEAD
Merge pm/opp tree to get dev_pm_opp_get_bw() Signed-off-by: Rob Clark <robdclark@chromium.org>
2 parents a546362 + b44b9bc commit c5fb51b

13,870 files changed

Lines changed: 531053 additions & 354876 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.

.clippy.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
3+
check-private-items = true
4+
5+
disallowed-macros = [
6+
# The `clippy::dbg_macro` lint only works with `std::dbg!`, thus we simulate
7+
# it here, see: https://github.com/rust-lang/rust-clippy/issues/11303.
8+
{ path = "kernel::dbg", reason = "the `dbg!` macro is intended as a debugging tool" },
9+
]

.get_maintainer.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Alan Cox <root@hraefn.swansea.linux.org.uk>
33
Christoph Hellwig <hch@lst.de>
44
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
55
Marc Gonzalez <marc.w.gonzalez@free.fr>
6+
Ralf Baechle <ralf@linux-mips.org>

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ modules.order
103103
# We don't want to ignore the following even if they are dot-files
104104
#
105105
!.clang-format
106+
!.clippy.toml
106107
!.cocciconfig
107108
!.editorconfig
108109
!.get_maintainer.ignore
@@ -128,6 +129,7 @@ series
128129

129130
# ctags files
130131
tags
132+
!tags/
131133
TAGS
132134

133135
# cscope files

.mailmap

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Alexei Avshalom Lazar <quic_ailizaro@quicinc.com> <ailizaro@codeaurora.org>
3737
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3838
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3939
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
40+
Alexey Klimov <alexey.klimov@linaro.org> <klimov.linux@gmail.com>
4041
Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>
4142
Alex Elder <elder@kernel.org>
4243
Alex Elder <elder@kernel.org> <aelder@sgi.com>
@@ -73,6 +74,8 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>
7374
Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>
7475
André Almeida <andrealmeid@igalia.com> <andrealmeid@collabora.com>
7576
Andy Adamson <andros@citi.umich.edu>
77+
Andy Chiu <andybnac@gmail.com> <andy.chiu@sifive.com>
78+
Andy Chiu <andybnac@gmail.com> <taochiu@synology.com>
7679
Andy Shevchenko <andy@kernel.org> <andy@smile.org.ua>
7780
Andy Shevchenko <andy@kernel.org> <ext-andriy.shevchenko@nokia.com>
7881
Anilkumar Kolli <quic_akolli@quicinc.com> <akolli@codeaurora.org>
@@ -197,18 +200,23 @@ Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>
197200
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
198201
Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>
199202
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
200-
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
203+
Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@microchip.com>
204+
Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@collabora.com>
201205
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
202206
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
203207
Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
204208
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>
205209
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>
210+
Fangrui Song <i@maskray.me> <maskray@google.com>
206211
Felipe W Damasio <felipewd@terra.com.br>
207212
Felix Kuhling <fxkuehl@gmx.de>
208213
Felix Moeller <felix@derklecks.de>
209214
Fenglin Wu <quic_fenglinw@quicinc.com> <fenglinw@codeaurora.org>
210215
Filipe Lautert <filipe@icewall.org>
211216
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
217+
Fiona Behrens <me@kloenk.dev>
218+
Fiona Behrens <me@kloenk.dev> <me@kloenk.de>
219+
Fiona Behrens <me@kloenk.dev> <fin@nyantec.com>
212220
Franck Bui-Huu <vagabon.xyz@gmail.com>
213221
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
214222
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sony.com>
@@ -244,6 +252,8 @@ Guru Das Srinagesh <quic_gurus@quicinc.com> <gurus@codeaurora.org>
244252
Gustavo Padovan <gustavo@las.ic.unicamp.br>
245253
Gustavo Padovan <padovan@profusion.mobi>
246254
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
255+
Hans Verkuil <hverkuil@xs4all.nl> <hansverk@cisco.com>
256+
Hans Verkuil <hverkuil@xs4all.nl> <hverkuil-cisco@xs4all.nl>
247257
Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
248258
Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
249259
Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@bqreaders.com>
@@ -262,6 +272,7 @@ Jack Pham <quic_jackp@quicinc.com> <jackp@codeaurora.org>
262272
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>
263273
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
264274
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
275+
Jai Luthra <jai.luthra@linux.dev> <j-luthra@ti.com>
265276
Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>
266277
James Bottomley <jejb@mulgrave.(none)>
267278
James Bottomley <jejb@titanic.il.steeleye.com>
@@ -276,7 +287,7 @@ Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
276287
Jan Kuliga <jtkuliga.kdev@gmail.com> <jankul@alatek.krakow.pl>
277288
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
278289
Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
279-
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
290+
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@parity.io>
280291
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
281292
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
282293
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -300,6 +311,11 @@ Jens Axboe <axboe@kernel.dk> <axboe@fb.com>
300311
Jens Axboe <axboe@kernel.dk> <axboe@meta.com>
301312
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
302313
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
314+
Jesper Dangaard Brouer <hawk@kernel.org> <brouer@redhat.com>
315+
Jesper Dangaard Brouer <hawk@kernel.org> <hawk@comx.dk>
316+
Jesper Dangaard Brouer <hawk@kernel.org> <jbrouer@redhat.com>
317+
Jesper Dangaard Brouer <hawk@kernel.org> <jdb@comx.dk>
318+
Jesper Dangaard Brouer <hawk@kernel.org> <netoptimizer@brouer.com>
303319
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
304320
Jilai Wang <quic_jilaiw@quicinc.com> <jilaiw@codeaurora.org>
305321
Jiri Kosina <jikos@kernel.org> <jikos@jikos.cz>
@@ -653,6 +669,7 @@ Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>
653669
Thomas Graf <tgraf@suug.ch>
654670
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
655671
Thomas Pedersen <twp@codeaurora.org>
672+
Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>
656673
Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
657674
Tingwei Zhang <quic_tingwei@quicinc.com> <tingwei@codeaurora.org>
658675
Tirupathi Reddy <quic_tirupath@quicinc.com> <tirupath@codeaurora.org>
@@ -717,6 +734,7 @@ Will Deacon <will@kernel.org> <will.deacon@arm.com>
717734
Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
718735
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
719736
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
737+
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
720738
Yusuke Goda <goda.yusuke@renesas.com>
721739
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
722740
Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

CREDITS

Lines changed: 43 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@ P: 1024/AF7B30C1 CF 97 C2 CC 6D AE A7 FE C8 BA 9C FC 88 DE 32 C3
185185
D: Linux/MIPS port
186186
D: Linux/68k hacker
187187
D: AX25 maintainer
188+
D: EDAC-CAVIUM OCTEON maintainer
189+
D: IOC3 ETHERNET DRIVER maintainer
190+
D: NETROM NETWORK LAYER maintainer
191+
D: ROSE NETWORK LAYER maintainer
192+
D: TURBOCHANNEL SUBSYSTEM maintainer
188193
S: Hauptstrasse 19
189194
S: 79837 St. Blasien
190195
S: Germany
@@ -574,6 +579,9 @@ N: Zach Brown
574579
E: zab@zabbo.net
575580
D: maestro pci sound
576581

582+
N: Zefan Li
583+
D: Contribution to control group stuff
584+
577585
N: David Brownell
578586
D: Kernel engineer, mentor, and friend. Maintained USB EHCI and
579587
D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
@@ -1204,6 +1212,10 @@ S: Dreisbachstrasse 24
12041212
S: D-57250 Netphen
12051213
S: Germany
12061214

1215+
N: Florian Fainelli
1216+
E: f.fainelli@gmail.com
1217+
D: DSA
1218+
12071219
N: Rik Faith
12081220
E: faith@acm.org
12091221
D: Future Domain TMC-16x0 SCSI driver (author)
@@ -1358,10 +1370,6 @@ D: Major kbuild rework during the 2.5 cycle
13581370
D: ISDN Maintainer
13591371
S: USA
13601372

1361-
N: Gerrit Renker
1362-
E: gerrit@erg.abdn.ac.uk
1363-
D: DCCP protocol support.
1364-
13651373
N: Philip Gladstone
13661374
E: philip@gladstonefamily.net
13671375
D: Kernel / timekeeping stuff
@@ -1677,11 +1685,6 @@ W: http://www.carumba.com/
16771685
D: bug toaster (A1 sauce makes all the difference)
16781686
D: Random linux hacker
16791687

1680-
N: James Hogan
1681-
E: jhogan@kernel.org
1682-
D: Metag architecture maintainer
1683-
D: TZ1090 SoC maintainer
1684-
16851688
N: Tim Hockin
16861689
E: thockin@hockin.org
16871690
W: http://www.hockin.org/~thockin
@@ -1697,6 +1700,11 @@ D: hwmon subsystem maintainer
16971700
D: i2c-sis96x and i2c-stub SMBus drivers
16981701
S: USA
16991702

1703+
N: James Hogan
1704+
E: jhogan@kernel.org
1705+
D: Metag architecture maintainer
1706+
D: TZ1090 SoC maintainer
1707+
17001708
N: Dirk Hohndel
17011709
E: hohndel@suse.de
17021710
D: The XFree86[tm] Project
@@ -1872,6 +1880,10 @@ S: K osmidomkum 723
18721880
S: 160 00 Praha 6
18731881
S: Czech Republic
18741882

1883+
N: Seth Jennings
1884+
E: sjenning@redhat.com
1885+
D: Creation and maintenance of zswap
1886+
18751887
N: Jeremy Kerr
18761888
D: Maintainer of SPU File System
18771889

@@ -2188,19 +2200,6 @@ N: Mike Kravetz
21882200
E: mike.kravetz@oracle.com
21892201
D: Maintenance and development of the hugetlb subsystem
21902202

2191-
N: Seth Jennings
2192-
E: sjenning@redhat.com
2193-
D: Creation and maintenance of zswap
2194-
2195-
N: Dan Streetman
2196-
E: ddstreet@ieee.org
2197-
D: Maintenance and development of zswap
2198-
D: Creation and maintenance of the zpool API
2199-
2200-
N: Vitaly Wool
2201-
E: vitaly.wool@konsulko.com
2202-
D: Maintenance and development of zswap
2203-
22042203
N: Andreas S. Krebs
22052204
E: akrebs@altavista.net
22062205
D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards
@@ -3191,6 +3190,11 @@ N: Ken Pizzini
31913190
E: ken@halcyon.com
31923191
D: CDROM driver "sonycd535" (Sony CDU-535/531)
31933192

3193+
N: Mathieu Poirier
3194+
E: mathieu.poirier@linaro.org
3195+
D: CoreSight kernel subsystem, Maintainer 2014-2022
3196+
D: Perf tool support for CoreSight
3197+
31943198
N: Stelian Pop
31953199
E: stelian@popies.net
31963200
P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0 D3F7 7185 9E7A EDBB 6147
@@ -3300,6 +3304,10 @@ S: Schlossbergring 9
33003304
S: 79098 Freiburg
33013305
S: Germany
33023306

3307+
N: Gerrit Renker
3308+
E: gerrit@erg.abdn.ac.uk
3309+
D: DCCP protocol support.
3310+
33033311
N: Thomas Renninger
33043312
E: trenn@suse.de
33053313
D: cpupowerutils
@@ -3576,11 +3584,6 @@ D: several improvements to system programs
35763584
S: Oldenburg
35773585
S: Germany
35783586

3579-
N: Mathieu Poirier
3580-
E: mathieu.poirier@linaro.org
3581-
D: CoreSight kernel subsystem, Maintainer 2014-2022
3582-
D: Perf tool support for CoreSight
3583-
35843587
N: Robert Schwebel
35853588
E: robert@schwebel.de
35863589
W: https://www.schwebel.de
@@ -3771,6 +3774,11 @@ S: Chr. Winthersvej 1 B, st.th.
37713774
S: DK-1860 Frederiksberg C
37723775
S: Denmark
37733776

3777+
N: Dan Streetman
3778+
E: ddstreet@ieee.org
3779+
D: Maintenance and development of zswap
3780+
D: Creation and maintenance of the zpool API
3781+
37743782
N: Drew Sullivan
37753783
E: drew@ss.org
37763784
W: http://www.ss.org/
@@ -3795,6 +3803,10 @@ S: Department of Zoology, University of Washington
37953803
S: Seattle, WA 98195-1800
37963804
S: USA
37973805

3806+
N: York Sun
3807+
E: york.sun@nxp.com
3808+
D: Freescale DDR EDAC
3809+
37983810
N: Eugene Surovegin
37993811
E: ebs@ebshome.net
38003812
W: https://kernel.ebshome.net/
@@ -4286,6 +4298,10 @@ S: Pipers Way
42864298
S: Swindon. SN3 1RJ
42874299
S: England
42884300

4301+
N: Vitaly Wool
4302+
E: vitaly.wool@konsulko.com
4303+
D: Maintenance and development of zswap
4304+
42894305
N: Chris Wright
42904306
E: chrisw@sous-sol.org
42914307
D: hacking on LSM framework and security modules.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /sys/fs/selinux/user
2+
Date: April 2005 (predates git)
3+
KernelVersion: 2.6.12-rc2 (predates git)
4+
Contact: selinux@vger.kernel.org
5+
Description:
6+
7+
The selinuxfs "user" node allows userspace to request a list
8+
of security contexts that can be reached for a given SELinux
9+
user from a given starting context. This was used by libselinux
10+
when various login-style programs requested contexts for
11+
users, but libselinux stopped using it in 2020.
12+
Kernel support will be removed no sooner than Dec 2025.

Documentation/ABI/stable/sysfs-block

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,13 @@ Description:
424424
[RW] This file is used to control (on/off) the iostats
425425
accounting of the disk.
426426

427+
What: /sys/block/<disk>/queue/iostats_passthrough
428+
Date: October 2024
429+
Contact: linux-block@vger.kernel.org
430+
Description:
431+
[RW] This file is used to control (on/off) the iostats
432+
accounting of the disk for passthrough commands.
433+
427434

428435
What: /sys/block/<disk>/queue/logical_block_size
429436
Date: May 2009
@@ -594,6 +601,9 @@ Description:
594601
[RW] Maximum number of kilobytes to read-ahead for filesystems
595602
on this block device.
596603

604+
For MADV_HUGEPAGE, the readahead size may exceed this setting
605+
since its granularity is based on the hugepage size.
606+
597607

598608
What: /sys/block/<disk>/queue/rotational
599609
Date: January 2009

0 commit comments

Comments
 (0)