Pull misc fixes from Andrew Morton: "9 hotfixes. 3 are cc:stable and the remainder address post-6.15 issues or aren't considered necessary for -stable kernels. Only 4 are for MM" * tag 'mm-hotfixes-stable-2025-06-13-21-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: mm: add mmap_prepare() compatibility layer for nested file systems init: fix build warnings about export.h MAINTAINERS: add Barry as a THP reviewer drivers/rapidio/rio_cm.c: prevent possible heap overwrite mm: close theoretical race where stale TLB entries could linger mm/vma: reset VMA iterator on commit_merge() OOM failure docs: proc: update VmFlags documentation in smaps scatterlist: fix extraneous '@'-sign kernel-doc notation selftests/mm: skip failed memfd setups in gup_longterm
Showing the changes to include/linux (2 of 14 files). Show all
Unified · Split
| @@ -2274,10 +2274,12 @@ static inline bool file_has_valid_mmap_hooks(struct file *file) · 2273 unmodified lines | ||
| 2274 | 2274 | return true; |
| 2275 | 2275 | } |
| 2276 | 2276 | |
| 2277 | +int compat_vma_mmap_prepare(struct file *file, struct vm_area_struct *vma); | |
| 2278 | + | |
| 2277 | 2279 | static inline int call_mmap(struct file *file, struct vm_area_struct *vma) |
| 2278 | 2280 | { |
| 2279 | − if (WARN_ON_ONCE(file->f_op->mmap_prepare)) | |
| 2280 | − return -EINVAL; | |
| 2281 | + if (file->f_op->mmap_prepare) | |
| 2282 | + return compat_vma_mmap_prepare(file, vma); | |
| 2281 | 2283 | |
| 2282 | 2284 | return file->f_op->mmap(file, vma); |
| 2283 | 2285 | } |
| @@ -99,7 +99,7 @@ static inline bool sg_is_last(struct scatterlist *sg) · 98 unmodified lines | ||
| 99 | 99 | * @sg: The current sg entry |
| 100 | 100 | * |
| 101 | 101 | * Description: |
| 102 | − * Usually the next entry will be @sg@ + 1, but if this sg element is part | |
| 102 | + * Usually the next entry will be @sg + 1, but if this sg element is part | |
| 103 | 103 | * of a chained scatterlist, it could jump to the start of a new |
| 104 | 104 | * scatterlist array. |
| 105 | 105 | * |
| @@ -254,7 +254,7 @@ static inline void __sg_chain(struct scatterlist *chain_sg, · 148 unmodified lines | ||
| 254 | 254 | * @sgl: Second scatterlist |
| 255 | 255 | * |
| 256 | 256 | * Description: |
| 257 | − * Links @prv@ and @sgl@ together, to form a longer scatterlist. | |
| 257 | + * Links @prv and @sgl together, to form a longer scatterlist. | |
| 258 | 258 | * |
| 259 | 259 | **/ |
| 260 | 260 | static inline void sg_chain(struct scatterlist *prv, unsigned int prv_nents, |