Skip to content

Commit 85b475a

Browse files
committed
Merge tag 'kvm-s390-master-6.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
A small fix that repairs the external loop detection code for PV guests.
2 parents 80962ec + 21f27df commit 85b475a

752 files changed

Lines changed: 8341 additions & 5281 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: 17 additions & 1 deletion
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>
@@ -132,6 +133,8 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
132133
Domen Puncer <domen@coderock.org>
133134
Douglas Gilbert <dougg@torque.net>
134135
Ed L. Cashin <ecashin@coraid.com>
136+
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
137+
Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>
135138
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
136139
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
137140
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
@@ -194,6 +197,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
194197
Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
195198
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
196199
Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
200+
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
197201
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
198202
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
199203
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -213,6 +217,9 @@ Jens Axboe <axboe@suse.de>
213217
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
214218
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
215219
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
220+
Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>
221+
Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>
222+
Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>
216223
Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
217224
Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
218225
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -374,6 +381,7 @@ Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
374381
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
375382
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
376383
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
384+
Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>
377385
Rajesh Shah <rajesh.shah@intel.com>
378386
Ralf Baechle <ralf@linux-mips.org>
379387
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -382,6 +390,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
382390
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
383391
Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
384392
Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
393+
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>
394+
Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
395+
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
385396
Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
386397
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
387398
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
@@ -392,6 +403,7 @@ Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
392403
Rudolf Marek <R.Marek@sh.cvut.cz>
393404
Rui Saraiva <rmps@joel.ist.utl.pt>
394405
Sachin P Sant <ssant@in.ibm.com>
406+
Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>
395407
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
396408
Sam Ravnborg <sam@mars.ravnborg.org>
397409
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
@@ -432,6 +444,10 @@ Thomas Graf <tgraf@suug.ch>
432444
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
433445
Thomas Pedersen <twp@codeaurora.org>
434446
Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
447+
Tobias Klauser <tklauser@distanz.ch> <tobias.klauser@gmail.com>
448+
Tobias Klauser <tklauser@distanz.ch> <klto@zhaw.ch>
449+
Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>
450+
Tobias Klauser <tklauser@distanz.ch> <tklauser@xenon.tklauser.home>
435451
Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
436452
Tony Luck <tony.luck@intel.com>
437453
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

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)