Skip to content

Commit ca712e4

Browse files
committed
Merge branch 'for-6.3/cxl-doe-fixes' into for-6.3/cxl
Pick up the fixes (first 6 patches) from the DOE rework series from Lukas for v6.3-rc. Link: https://lore.kernel.org/all/[email protected]/
2 parents 24b1819 + abf04be commit ca712e4

File tree

483 files changed

+4547
-4267
lines changed

Some content is hidden

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

483 files changed

+4547
-4267
lines changed

.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: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Alexander Lobakin <[email protected]> <[email protected]>
2828
Alexander Mikhalitsyn <[email protected]> <[email protected]>
2929
Alexander Mikhalitsyn <[email protected]> <[email protected]>
3030
31+
3132
Alexei Starovoitov <[email protected]> <[email protected]>
3233
Alexei Starovoitov <[email protected]> <[email protected]>
3334
Alexei Starovoitov <[email protected]> <[email protected]>
@@ -121,7 +122,7 @@ Dengcheng Zhu <[email protected]> <[email protected]>
121122
122123
123124
124-
Dikshita Agarwal <[email protected].com> <[email protected]>
125+
Dikshita Agarwal <quic_dikshita@quicinc.com> <[email protected]>
125126
Dmitry Baryshkov <[email protected]>
126127
Dmitry Baryshkov <[email protected]> <[[email protected]]>
127128
@@ -194,6 +195,7 @@ Jan Glauber <[email protected]> <[email protected]>
194195
195196
196197
198+
197199
198200
199201
@@ -213,6 +215,9 @@ Jens Axboe <[email protected]>
213215
Jens Osterkamp <[email protected]>
214216
215217
218+
219+
220+
216221
217222
218223

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/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

Documentation/mm/physical_memory.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ one of the types described below.
6666
also populated on boot using one of ``kernelcore``, ``movablecore`` and
6767
``movable_node`` kernel command line parameters. See
6868
Documentation/mm/page_migration.rst and
69-
Documentation/admin-guide/mm/memory_hotplug.rst for additional details.
69+
Documentation/admin-guide/mm/memory-hotplug.rst for additional details.
7070

7171
* ``ZONE_DEVICE`` represents memory residing on devices such as PMEM and GPU.
7272
It has different characteristics than RAM zone types and it exists to provide

Documentation/netlink/genetlink-c.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
1+
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
22
%YAML 1.2
33
---
44
$id: http://kernel.org/schemas/netlink/genetlink-c.yaml#

Documentation/netlink/genetlink-legacy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
1+
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
22
%YAML 1.2
33
---
44
$id: http://kernel.org/schemas/netlink/genetlink-legacy.yaml#

0 commit comments

Comments
 (0)