Skip to content

Commit 9d6ff17

Browse files
committed
Merge tag 'v6.3-rc3'
Merge v6.3-rc3, so that 'acpi_quirk_skip_gpio_event_handlers' is available, which is needed for adding x86 android tablet support in axp288_charger. Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
2 parents 7cc7478 + e8d018d commit 9d6ff17

830 files changed

Lines changed: 8352 additions & 56452 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.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ modules.order
7878
# RPM spec file (make rpm-pkg)
7979
#
8080
/*.spec
81+
/rpmbuild/
8182

8283
#
8384
# Debian directory (make deb-pkg)

.mailmap

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
2828
Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
2929
Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>
3030
Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
31+
Alexandre Ghiti <alex@ghiti.fr> <alexandre.ghiti@canonical.com>
3132
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3233
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3334
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
@@ -121,7 +122,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
121122
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
122123
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
123124
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
124-
Dikshita Agarwal <dikshita@qti.qualcomm.com> <dikshita@codeaurora.org>
125+
Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>
125126
Dmitry Baryshkov <dbaryshkov@gmail.com>
126127
Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
127128
Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
@@ -136,6 +137,9 @@ Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
136137
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
137138
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
138139
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
140+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
141+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>
142+
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>
139143
Felipe W Damasio <felipewd@terra.com.br>
140144
Felix Kuhling <fxkuehl@gmx.de>
141145
Felix Moeller <felix@derklecks.de>
@@ -191,6 +195,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
191195
Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
192196
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
193197
Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
198+
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
194199
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
195200
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
196201
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -210,6 +215,9 @@ Jens Axboe <axboe@suse.de>
210215
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
211216
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
212217
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
218+
Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>
219+
Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>
220+
Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>
213221
Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
214222
Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
215223
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -306,6 +314,8 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
306314
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
307315
Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
308316
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
317+
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>
318+
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>
309319
Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
310320
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
311321
Mayuresh Janorkar <mayur@ti.com>
@@ -411,7 +421,10 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
411421
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
412422
Simon Kelley <simon@thekelleys.org.uk>
413423
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
414-
Stephen Hemminger <shemminger@osdl.org>
424+
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
425+
Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
426+
Stephen Hemminger <stephen@networkplumber.org> <sthemmin@microsoft.com>
427+
Stephen Hemminger <stephen@networkplumber.org> <sthemmin@vyatta.com>
415428
Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>
416429
Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>
417430
Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>

Documentation/ABI/stable/sysfs-block

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,15 @@ Description:
705705
zoned will report "none".
706706

707707

708+
What: /sys/block/<disk>/hidden
709+
Date: March 2023
710+
Contact: linux-block@vger.kernel.org
711+
Description:
712+
[RO] the block device is hidden. it doesn’t produce events, and
713+
can’t be opened from userspace or using blkdev_get*.
714+
Used for the underlying components of multipath devices.
715+
716+
708717
What: /sys/block/<disk>/stat
709718
Date: February 2008
710719
Contact: Jerome Marchand <jmarchan@redhat.com>

Documentation/bpf/bpf_devel_QA.rst

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ workflows related to reporting bugs, submitting patches, and queueing
77
patches for stable kernels.
88

99
For general information about submitting patches, please refer to
10-
`Documentation/process/`_. This document only describes additional specifics
11-
related to BPF.
10+
Documentation/process/submitting-patches.rst. This document only describes
11+
additional specifics related to BPF.
1212

1313
.. contents::
1414
:local:
@@ -461,15 +461,15 @@ needed::
461461

462462
$ sudo make run_tests
463463

464-
See the kernels selftest `Documentation/dev-tools/kselftest.rst`_
465-
document for further documentation.
464+
See :doc:`kernel selftest documentation </dev-tools/kselftest>`
465+
for details.
466466

467467
To maximize the number of tests passing, the .config of the kernel
468468
under test should match the config file fragment in
469469
tools/testing/selftests/bpf as closely as possible.
470470

471471
Finally to ensure support for latest BPF Type Format features -
472-
discussed in `Documentation/bpf/btf.rst`_ - pahole version 1.16
472+
discussed in Documentation/bpf/btf.rst - pahole version 1.16
473473
is required for kernels built with CONFIG_DEBUG_INFO_BTF=y.
474474
pahole is delivered in the dwarves package or can be built
475475
from source at
@@ -684,12 +684,8 @@ when:
684684

685685

686686
.. Links
687-
.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
688687
.. _netdev-FAQ: Documentation/process/maintainer-netdev.rst
689688
.. _selftests:
690689
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/bpf/
691-
.. _Documentation/dev-tools/kselftest.rst:
692-
https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html
693-
.. _Documentation/bpf/btf.rst: btf.rst
694690

695691
Happy BPF hacking!

Documentation/driver-api/vfio.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ group and can access them as follows::
242242
VFIO User API
243243
-------------------------------------------------------------------------------
244244

245-
Please see include/linux/vfio.h for complete API documentation.
245+
Please see include/uapi/linux/vfio.h for complete API documentation.
246246

247247
VFIO bus driver API
248248
-------------------------------------------------------------------------------

Documentation/filesystems/ext4/blockgroup.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ descriptors. Instead, the superblock and a single block group descriptor
105105
block is placed at the beginning of the first, second, and last block
106106
groups in a meta-block group. A meta-block group is a collection of
107107
block groups which can be described by a single block group descriptor
108-
block. Since the size of the block group descriptor structure is 32
109-
bytes, a meta-block group contains 32 block groups for filesystems with
110-
a 1KB block size, and 128 block groups for filesystems with a 4KB
108+
block. Since the size of the block group descriptor structure is 64
109+
bytes, a meta-block group contains 16 block groups for filesystems with
110+
a 1KB block size, and 64 block groups for filesystems with a 4KB
111111
blocksize. Filesystems can either be created using this new block group
112112
descriptor layout, or existing filesystems can be resized on-line, and
113113
the field s_first_meta_bg in the superblock will indicate the first

Documentation/filesystems/vfs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ defined:
12221222
return
12231223
-ECHILD and it will be called again in ref-walk mode.
12241224

1225-
``_weak_revalidate``
1225+
``d_weak_revalidate``
12261226
called when the VFS needs to revalidate a "jumped" dentry. This
12271227
is called when a path-walk ends at dentry that was not acquired
12281228
by doing a lookup in the parent directory. This includes "/",

Documentation/firmware-guide/acpi/enumeration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ possible we decided to do following:
1919
platform devices.
2020

2121
- Devices behind real busses where there is a connector resource
22-
are represented as struct spi_device or struct i2c_device. Note
22+
are represented as struct spi_device or struct i2c_client. Note
2323
that standard UARTs are not busses so there is no struct uart_device,
2424
although some of them may be represented by struct serdev_device.
2525

Documentation/maintainer/rebasing-and-merging.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,7 @@ point rather than some random spot. If your upstream-bound branch has
213213
emptied entirely into the mainline during the merge window, you can pull it
214214
forward with a command like::
215215

216-
git merge v5.2-rc1^0
217-
218-
The "^0" will cause Git to do a fast-forward merge (which should be
219-
possible in this situation), thus avoiding the addition of a spurious merge
220-
commit.
216+
git merge --ff-only v5.2-rc1
221217

222218
The guidelines laid out above are just that: guidelines. There will always
223219
be situations that call out for a different solution, and these guidelines

Documentation/mm/hugetlbfs_reserv.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Hugetlbfs Reservation
55
Overview
66
========
77

8-
Huge pages as described at Documentation/mm/hugetlbpage.rst are typically
9-
preallocated for application use. These huge pages are instantiated in a
10-
task's address space at page fault time if the VMA indicates huge pages are
11-
to be used. If no huge page exists at page fault time, the task is sent
8+
Huge pages as described at Documentation/admin-guide/mm/hugetlbpage.rst are
9+
typically preallocated for application use. These huge pages are instantiated
10+
in a task's address space at page fault time if the VMA indicates huge pages
11+
are to be used. If no huge page exists at page fault time, the task is sent
1212
a SIGBUS and often dies an unhappy death. Shortly after huge page support
1313
was added, it was determined that it would be better to detect a shortage
1414
of huge pages at mmap() time. The idea is that if there were not enough

0 commit comments

Comments
 (0)