Skip to content

Commit e23654f

Browse files
committed
Merge tag 'fuse-fixes-6.17-rc5' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse into vfs.fixes
fuse fixes for 6.17-rc5 * tag 'fuse-fixes-6.17-rc5' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: (6 commits) fuse: Block access to folio overlimit fuse: fix fuseblk i_blkbits for iomap partial writes fuse: reflect cached blocksize if blocksize was changed fuse: prevent overflow in copy_file_range return value fuse: check if copy_file_range() returns larger than requested size fuse: do not allow mapping a non-regular backing file Link: https://lore.kernel.org/CAJfpeguEVMMyw_zCb+hbOuSxdE2Z3Raw=SJsq=Y56Ae6dn2W3g@mail.gmail.com Signed-off-by: Christian Brauner <[email protected]>
2 parents bb58559 + 9d81ba6 commit e23654f

File tree

344 files changed

+4067
-1649
lines changed

Some content is hidden

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

344 files changed

+4067
-1649
lines changed

.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ Domen Puncer <[email protected]>
226226
Douglas Gilbert <[email protected]>
227227
228228
229+
230+
229231
Ed L. Cashin <[email protected]>
230232
231233
Enric Balletbo i Serra <[email protected]> <[email protected]>

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ both cgroups.
435435
Controlling Controllers
436436
-----------------------
437437

438-
Availablity
439-
~~~~~~~~~~~
438+
Availability
439+
~~~~~~~~~~~~
440440

441441
A controller is available in a cgroup when it is supported by the kernel (i.e.,
442442
compiled in, not disabled and not attached to a v1 hierarchy) and listed in the

Documentation/devicetree/bindings/regulator/infineon,ir38060.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Infineon Buck Regulators with PMBUS interfaces
88

99
maintainers:
10-
- Not Me.
10+
- Guenter Roeck <[email protected]>
1111

1212
allOf:
1313
- $ref: regulator.yaml#

Documentation/networking/mptcp-sysctl.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ add_addr_timeout - INTEGER (seconds)
1212
resent to an MPTCP peer that has not acknowledged a previous
1313
ADD_ADDR message.
1414

15+
Do not retransmit if set to 0.
16+
1517
The default value matches TCP_RTO_MAX. This is a per-namespace
1618
sysctl.
1719

Documentation/process/security-bugs.rst

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,22 @@ like to know when a security bug is found so that it can be fixed and
88
disclosed as quickly as possible. Please report security bugs to the
99
Linux kernel security team.
1010

11-
Contact
12-
-------
11+
The security team and maintainers almost always require additional
12+
information beyond what was initially provided in a report and rely on
13+
active and efficient collaboration with the reporter to perform further
14+
testing (e.g., verifying versions, configuration options, mitigations, or
15+
patches). Before contacting the security team, the reporter must ensure
16+
they are available to explain their findings, engage in discussions, and
17+
run additional tests. Reports where the reporter does not respond promptly
18+
or cannot effectively discuss their findings may be abandoned if the
19+
communication does not quickly improve.
20+
21+
As it is with any bug, the more information provided the easier it
22+
will be to diagnose and fix. Please review the procedure outlined in
23+
'Documentation/admin-guide/reporting-issues.rst' if you are unclear about what
24+
information is helpful. Any exploit code is very helpful and will not
25+
be released without consent from the reporter unless it has already been
26+
made public.
1327

1428
The Linux kernel security team can be contacted by email at
1529
<[email protected]>. This is a private list of security officers
@@ -19,13 +33,6 @@ that can speed up the process considerably. It is possible that the
1933
security team will bring in extra help from area maintainers to
2034
understand and fix the security vulnerability.
2135

22-
As it is with any bug, the more information provided the easier it
23-
will be to diagnose and fix. Please review the procedure outlined in
24-
'Documentation/admin-guide/reporting-issues.rst' if you are unclear about what
25-
information is helpful. Any exploit code is very helpful and will not
26-
be released without consent from the reporter unless it has already been
27-
made public.
28-
2936
Please send plain text emails without attachments where possible.
3037
It is much harder to have a context-quoted discussion about a complex
3138
issue if all the details are hidden away in attachments. Think of it like a

Documentation/userspace-api/iommufd.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Following IOMMUFD objects are exposed to userspace:
4343

4444
- IOMMUFD_OBJ_HWPT_PAGING, representing an actual hardware I/O page table
4545
(i.e. a single struct iommu_domain) managed by the iommu driver. "PAGING"
46-
primarly indicates this type of HWPT should be linked to an IOAS. It also
46+
primarily indicates this type of HWPT should be linked to an IOAS. It also
4747
indicates that it is backed by an iommu_domain with __IOMMU_DOMAIN_PAGING
4848
feature flag. This can be either an UNMANAGED stage-1 domain for a device
4949
running in the user space, or a nesting parent stage-2 domain for mappings
@@ -76,7 +76,7 @@ Following IOMMUFD objects are exposed to userspace:
7676

7777
* Security namespace for guest owned ID, e.g. guest-controlled cache tags
7878
* Non-device-affiliated event reporting, e.g. invalidation queue errors
79-
* Access to a sharable nesting parent pagetable across physical IOMMUs
79+
* Access to a shareable nesting parent pagetable across physical IOMMUs
8080
* Virtualization of various platforms IDs, e.g. RIDs and others
8181
* Delivery of paravirtualized invalidation
8282
* Direct assigned invalidation queues

MAINTAINERS

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8426,6 +8426,17 @@ T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
84268426
F: drivers/gpu/drm/scheduler/
84278427
F: include/drm/gpu_scheduler.h
84288428

8429+
DRM GPUVM
8430+
M: Danilo Krummrich <[email protected]>
8431+
R: Matthew Brost <[email protected]>
8432+
R: Thomas Hellström <[email protected]>
8433+
R: Alice Ryhl <[email protected]>
8434+
8435+
S: Supported
8436+
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
8437+
F: drivers/gpu/drm/drm_gpuvm.c
8438+
F: include/drm/drm_gpuvm.h
8439+
84298440
DRM LOG
84308441
M: Jocelyn Falempe <[email protected]>
84318442
M: Javier Martinez Canillas <[email protected]>
@@ -10655,7 +10666,8 @@ S: Maintained
1065510666
F: block/partitions/efi.*
1065610667

1065710668
HABANALABS PCI DRIVER
10658-
M: Yaron Avizrat <[email protected]>
10669+
M: Koby Elbaz <[email protected]>
10670+
M: Konstantin Sinyuk <[email protected]>
1065910671
1066010672
S: Supported
1066110673
C: irc://irc.oftc.net/dri-devel
@@ -11013,7 +11025,7 @@ F: Documentation/admin-guide/perf/hns3-pmu.rst
1101311025
F: drivers/perf/hisilicon/hns3_pmu.c
1101411026

1101511027
HISILICON I2C CONTROLLER DRIVER
11016-
M: Yicong Yang <yangyicong@hisilicon.com>
11028+
M: Devyn Liu <liudingyuan@h-partners.com>
1101711029
1101811030
S: Maintained
1101911031
W: https://www.hisilicon.com
@@ -12281,7 +12293,6 @@ F: include/linux/avf/virtchnl.h
1228112293
F: include/linux/net/intel/*/
1228212294

1228312295
INTEL ETHERNET PROTOCOL DRIVER FOR RDMA
12284-
M: Mustafa Ismail <[email protected]>
1228512296
M: Tatyana Nikolova <[email protected]>
1228612297
1228712298
S: Supported
@@ -16058,6 +16069,23 @@ F: mm/mempolicy.c
1605816069
F: mm/migrate.c
1605916070
F: mm/migrate_device.c
1606016071

16072+
MEMORY MANAGEMENT - MGLRU (MULTI-GEN LRU)
16073+
M: Andrew Morton <[email protected]>
16074+
M: Axel Rasmussen <[email protected]>
16075+
M: Yuanchu Xie <[email protected]>
16076+
R: Wei Xu <[email protected]>
16077+
16078+
S: Maintained
16079+
W: http://www.linux-mm.org
16080+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
16081+
F: Documentation/admin-guide/mm/multigen_lru.rst
16082+
F: Documentation/mm/multigen_lru.rst
16083+
F: include/linux/mm_inline.h
16084+
F: include/linux/mmzone.h
16085+
F: mm/swap.c
16086+
F: mm/vmscan.c
16087+
F: mm/workingset.c
16088+
1606116089
MEMORY MANAGEMENT - MISC
1606216090
M: Andrew Morton <[email protected]>
1606316091
M: David Hildenbrand <[email protected]>
@@ -16248,8 +16276,10 @@ S: Maintained
1624816276
W: http://www.linux-mm.org
1624916277
T: git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
1625016278
F: rust/helpers/mm.c
16279+
F: rust/helpers/page.c
1625116280
F: rust/kernel/mm.rs
1625216281
F: rust/kernel/mm/
16282+
F: rust/kernel/page.rs
1625316283

1625416284
MEMORY MAPPING
1625516285
M: Andrew Morton <[email protected]>
@@ -22174,7 +22204,7 @@ F: arch/s390/mm
2217422204

2217522205
S390 NETWORK DRIVERS
2217622206
M: Alexandra Winter <[email protected]>
22177-
M: Thorsten Winkler <twinkler@linux.ibm.com>
22207+
R: Aswin Karuvally <aswin@linux.ibm.com>
2217822208
2217922209
2218022210
S: Supported

Makefile

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

88
# *DOCUMENTATION*

arch/loongarch/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,13 @@ KBUILD_CFLAGS += $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma)
102102

103103
ifdef CONFIG_OBJTOOL
104104
ifdef CONFIG_CC_HAS_ANNOTATE_TABLEJUMP
105+
# The annotate-tablejump option can not be passed to LLVM backend when LTO is enabled.
106+
# Ensure it is aware of linker with LTO, '--loongarch-annotate-tablejump' also needs to
107+
# be passed via '-mllvm' to ld.lld.
105108
KBUILD_CFLAGS += -mannotate-tablejump
109+
ifdef CONFIG_LTO_CLANG
110+
KBUILD_LDFLAGS += -mllvm --loongarch-annotate-tablejump
111+
endif
106112
else
107113
KBUILD_CFLAGS += -fno-jump-tables # keep compatibility with older compilers
108114
endif

arch/loongarch/include/asm/stackframe.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
.endm
5959

6060
.macro STACKLEAK_ERASE
61-
#ifdef CONFIG_GCC_PLUGIN_STACKLEAK
61+
#ifdef CONFIG_KSTACK_ERASE
6262
bl stackleak_erase_on_task_stack
6363
#endif
6464
.endm

0 commit comments

Comments
 (0)