Skip to content

Commit 0b59ce7

Browse files
authored
Merge pull request torvalds#660 from ojeda/sync
Sync with v5.17-rc3
2 parents 673ea95 + f58a1a6 commit 0b59ce7

File tree

379 files changed

+5172
-2419
lines changed

Some content is hidden

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

379 files changed

+5172
-2419
lines changed

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
8080
Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
8181
Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>
8282
Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>
83+
Christian Brauner <brauner@kernel.org> <christian@brauner.io>
84+
Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
85+
Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
8386
Christophe Ricard <christophe.ricard@gmail.com>
8487
Christoph Hellwig <hch@lst.de>
8588
Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>

Documentation/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ stable kernels.
100100
+----------------+-----------------+-----------------+-----------------------------+
101101
| ARM | Cortex-A510 | #2051678 | ARM64_ERRATUM_2051678 |
102102
+----------------+-----------------+-----------------+-----------------------------+
103+
| ARM | Cortex-A510 | #2077057 | ARM64_ERRATUM_2077057 |
104+
+----------------+-----------------+-----------------+-----------------------------+
103105
| ARM | Cortex-A710 | #2119858 | ARM64_ERRATUM_2119858 |
104106
+----------------+-----------------+-----------------+-----------------------------+
105107
| ARM | Cortex-A710 | #2054223 | ARM64_ERRATUM_2054223 |

Documentation/dev-tools/kselftest.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ directory. These are intended to be small tests to exercise individual code
77
paths in the kernel. Tests are intended to be run after building, installing
88
and booting a kernel.
99

10+
Kselftest from mainline can be run on older stable kernels. Running tests
11+
from mainline offers the best coverage. Several test rings run mainline
12+
kselftest suite on stable releases. The reason is that when a new test
13+
gets added to test existing code to regression test a bug, we should be
14+
able to run that test on an older kernel. Hence, it is important to keep
15+
code that can still test an older kernel and make sure it skips the test
16+
gracefully on newer releases.
17+
1018
You can find additional information on Kselftest framework, how to
1119
write new tests using the framework on Kselftest wiki:
1220

Documentation/devicetree/bindings/net/qcom,ipa.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ properties:
107107
- const: imem
108108
- const: config
109109

110+
qcom,qmp:
111+
$ref: /schemas/types.yaml#/definitions/phandle
112+
description: phandle to the AOSS side-channel message RAM
113+
110114
qcom,smem-states:
111115
$ref: /schemas/types.yaml#/definitions/phandle-array
112116
description: State bits used in by the AP to signal the modem.
@@ -222,6 +226,8 @@ examples:
222226
"imem",
223227
"config";
224228
229+
qcom,qmp = <&aoss_qmp>;
230+
225231
qcom,smem-states = <&ipa_smp2p_out 0>,
226232
<&ipa_smp2p_out 1>;
227233
qcom,smem-state-names = "ipa-clock-enabled-valid",

Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ properties:
2323
minItems: 1
2424
maxItems: 256
2525
items:
26-
minimum: 0
27-
maximum: 256
26+
items:
27+
- minimum: 0
28+
maximum: 256
2829
description:
2930
Chip select used by the device.
3031

Documentation/filesystems/netfs_library.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,10 @@ operation table looks like the following::
462462
struct iov_iter *iter,
463463
netfs_io_terminated_t term_func,
464464
void *term_func_priv);
465+
466+
int (*query_occupancy)(struct netfs_cache_resources *cres,
467+
loff_t start, size_t len, size_t granularity,
468+
loff_t *_data_start, size_t *_data_len);
465469
};
466470

467471
With a termination handler function pointer::
@@ -536,6 +540,18 @@ The methods defined in the table are:
536540
indicating whether the termination is definitely happening in the caller's
537541
context.
538542

543+
* ``query_occupancy()``
544+
545+
[Required] Called to find out where the next piece of data is within a
546+
particular region of the cache. The start and length of the region to be
547+
queried are passed in, along with the granularity to which the answer needs
548+
to be aligned. The function passes back the start and length of the data,
549+
if any, available within that region. Note that there may be a hole at the
550+
front.
551+
552+
It returns 0 if some data was found, -ENODATA if there was no usable data
553+
within the region or -ENOBUFS if there is no caching on this file.
554+
539555
Note that these methods are passed a pointer to the cache resource structure,
540556
not the read request structure as they could be used in other situations where
541557
there isn't a read request structure as well, such as writing dirty data to the

Documentation/gpu/todo.rst

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -300,30 +300,6 @@ Contact: Daniel Vetter, Noralf Tronnes
300300

301301
Level: Advanced
302302

303-
Garbage collect fbdev scrolling acceleration
304-
--------------------------------------------
305-
306-
Scroll acceleration has been disabled in fbcon. Now it works as the old
307-
SCROLL_REDRAW mode. A ton of code was removed in fbcon.c and the hook bmove was
308-
removed from fbcon_ops.
309-
Remaining tasks:
310-
311-
- a bunch of the hooks in fbcon_ops could be removed or simplified by calling
312-
directly instead of the function table (with a switch on p->rotate)
313-
314-
- fb_copyarea is unused after this, and can be deleted from all drivers
315-
316-
- after that, fb_copyarea can be deleted from fb_ops in include/linux/fb.h as
317-
well as cfb_copyarea
318-
319-
Note that not all acceleration code can be deleted, since clearing and cursor
320-
support is still accelerated, which might be good candidates for further
321-
deletion projects.
322-
323-
Contact: Daniel Vetter
324-
325-
Level: Intermediate
326-
327303
idr_init_base()
328304
---------------
329305

Documentation/userspace-api/ioctl/ioctl-number.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ Code Seq# Include File Comments
115115
'B' 00-1F linux/cciss_ioctl.h conflict!
116116
'B' 00-0F include/linux/pmu.h conflict!
117117
'B' C0-FF advanced bbus <mailto:maassen@uni-freiburg.de>
118+
'B' 00-0F xen/xenbus_dev.h conflict!
118119
'C' all linux/soundcard.h conflict!
119120
'C' 01-2F linux/capi.h conflict!
120121
'C' F0-FF drivers/net/wan/cosa.h conflict!
@@ -134,6 +135,7 @@ Code Seq# Include File Comments
134135
'F' 80-8F linux/arcfb.h conflict!
135136
'F' DD video/sstfb.h conflict!
136137
'G' 00-3F drivers/misc/sgi-gru/grulib.h conflict!
138+
'G' 00-0F xen/gntalloc.h, xen/gntdev.h conflict!
137139
'H' 00-7F linux/hiddev.h conflict!
138140
'H' 00-0F linux/hidraw.h conflict!
139141
'H' 01 linux/mei.h conflict!
@@ -176,6 +178,7 @@ Code Seq# Include File Comments
176178
'P' 60-6F sound/sscape_ioctl.h conflict!
177179
'P' 00-0F drivers/usb/class/usblp.c conflict!
178180
'P' 01-09 drivers/misc/pci_endpoint_test.c conflict!
181+
'P' 00-0F xen/privcmd.h conflict!
179182
'Q' all linux/soundcard.h
180183
'R' 00-1F linux/random.h conflict!
181184
'R' 01 linux/rfkill.h conflict!

MAINTAINERS

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4157,9 +4157,8 @@ N: csky
41574157
K: csky
41584158

41594159
CA8210 IEEE-802.15.4 RADIO DRIVER
4160-
M: Harry Morris <h.morris@cascoda.com>
41614160
L: linux-wpan@vger.kernel.org
4162-
S: Maintained
4161+
S: Orphan
41634162
W: https://github.com/Cascoda/ca8210-linux.git
41644163
F: Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
41654164
F: drivers/net/ieee802154/ca8210.c
@@ -10880,6 +10879,12 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
1088010879
F: drivers/ata/pata_arasan_cf.c
1088110880
F: include/linux/pata_arasan_cf_data.h
1088210881

10882+
LIBATA PATA DRIVERS
10883+
R: Sergey Shtylyov <s.shtylyov@omp.ru>
10884+
L: linux-ide@vger.kernel.org
10885+
F: drivers/ata/ata_*.c
10886+
F: drivers/ata/pata_*.c
10887+
1088310888
LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
1088410889
M: Linus Walleij <linus.walleij@linaro.org>
1088510890
L: linux-ide@vger.kernel.org
@@ -12400,7 +12405,7 @@ F: include/uapi/linux/membarrier.h
1240012405
F: kernel/sched/membarrier.c
1240112406

1240212407
MEMBLOCK
12403-
M: Mike Rapoport <rppt@linux.ibm.com>
12408+
M: Mike Rapoport <rppt@kernel.org>
1240412409
L: linux-mm@kvack.org
1240512410
S: Maintained
1240612411
F: Documentation/core-api/boot-time-mm.rst
@@ -16469,6 +16474,14 @@ F: Documentation/devicetree/bindings/i2c/renesas,rmobile-iic.yaml
1646916474
F: drivers/i2c/busses/i2c-rcar.c
1647016475
F: drivers/i2c/busses/i2c-sh_mobile.c
1647116476

16477+
RENESAS R-CAR SATA DRIVER
16478+
R: Sergey Shtylyov <s.shtylyov@omp.ru>
16479+
S: Supported
16480+
L: linux-ide@vger.kernel.org
16481+
L: linux-renesas-soc@vger.kernel.org
16482+
F: Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml
16483+
F: drivers/ata/sata_rcar.c
16484+
1647216485
RENESAS R-CAR THERMAL DRIVERS
1647316486
M: Niklas Söderlund <niklas.soderlund@ragnatech.se>
1647416487
L: linux-renesas-soc@vger.kernel.org

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 5
33
PATCHLEVEL = 17
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc2
5+
EXTRAVERSION = -rc3
66
NAME = Gobble Gobble
77

88
# *DOCUMENTATION*

0 commit comments

Comments
 (0)