| Message ID | 20241127-vfs-fixes-08465cd270d3@brauner (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] vfs fixes | expand |
On Wed, 27 Nov 2024 at 07:41, Christian Brauner <brauner@kernel.org> wrote: > > I was sent a bug fix for the backing file rework that relied on the > overlayfs pull request. The vfs.fixes branch used an earlier mainline > commit as base. So I thought how to resolve this and my solution was to > create a new ovl.fixes branch which contained the overlayfs changes for > v6.13 and then apply the fix on top of it. That branch was then merged > into vfs.fixes with an explanation why. Let me know if I should do this > differently next time. Thanks, this looks good - exactly like I think it should have been done. Pulled, Linus
The pull request you sent on Wed, 27 Nov 2024 16:41:03 +0100:
> git@gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs tags/vfs-6.13-rc1.fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7d4050728c83aa63828494ad0f4d0eb4faf5f97a
Thank you!
Hey Linus, I was sent a bug fix for the backing file rework that relied on the overlayfs pull request. The vfs.fixes branch used an earlier mainline commit as base. So I thought how to resolve this and my solution was to create a new ovl.fixes branch which contained the overlayfs changes for v6.13 and then apply the fix on top of it. That branch was then merged into vfs.fixes with an explanation why. Let me know if I should do this differently next time. /* Summary */ This contains various fixes for this cycle: - Fix a few iomap bugs. - Fix a wrong argument in backing file callback. - Fix security mount option retrieval in statmount(). - Cleanup how statmount() handles unescaped options. - Add a missing inode_owner_or_capable() check for setting write hints. - Clear the return value in read_kcore_iter() after a successful iov_iter_zero(). - Fix a mount_setattr() selftest. - Fix function signature in mount api documentation. - Remove duplicate include header in the fscache code. /* Testing */ gcc version 14.2.0 (Debian 14.2.0-6) Debian clang version 16.0.6 (27+b1) All patches have been sitting in linux-next. No build failures or warnings were observed. /* Conflicts */ Merge conflicts with mainline ============================= No known conflicts. Merge conflicts with other trees ================================ No known conflicts. The following changes since commit e7675238b9bf4db0b872d5dbcd53efa31914c98f: Merge tag 'ovl-update-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs (2024-11-22 20:55:42 -0800) are available in the Git repository at: git@gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs tags/vfs-6.13-rc1.fixes for you to fetch changes up to cf87766dd6f9ddcceaa8ee26e3cbd7538e42dd19: Merge branch 'ovl.fixes' (2024-11-26 18:15:06 +0100) Please consider pulling these changes from the signed vfs-6.13-rc1.fixes tag. Thanks! Christian ---------------------------------------------------------------- vfs-6.13-rc1.fixes ---------------------------------------------------------------- Amir Goldstein (1): fs/backing_file: fix wrong argument in callback Brian Foster (4): iomap: warn on zero range of a post-eof folio iomap: reset per-iter state on non-error iter advances iomap: lift zeroed mapping handling into iomap_zero_range() iomap: elide flush from partial eof zero range Christian Brauner (3): Merge patch series "iomap: zero range flush fixes" statmount: fix security option retrieval Merge branch 'ovl.fixes' Christoph Hellwig (1): fs: require inode_owner_or_capable for F_SET_RW_HINT Jiri Olsa (1): fs/proc/kcore.c: Clear ret value in read_kcore_iter after successful iov_iter_zero Michael Ellerman (1): selftests/mount_setattr: Fix failures on 64K PAGE_SIZE kernels Miklos Szeredi (1): statmount: clean up unescaped option handling Randy Dunlap (1): fs_parser: update mount_api doc to match function signature Thorsten Blum (1): fscache: Remove duplicate included header Documentation/filesystems/mount_api.rst | 3 +- fs/backing-file.c | 3 +- fs/fcntl.c | 3 + fs/iomap/buffered-io.c | 90 +++++++++++----------- fs/iomap/iter.c | 11 ++- fs/namespace.c | 46 +++++------ fs/netfs/fscache_io.c | 1 - fs/proc/kcore.c | 1 + .../selftests/mount_setattr/mount_setattr_test.c | 2 +- 9 files changed, 81 insertions(+), 79 deletions(-)