* [git pull] a couple of misc vfs patches
@ 2025-02-01 22:56 Al Viro
2025-02-01 23:25 ` pr-tracker-bot
0 siblings, 1 reply; 2+ messages in thread
From: Al Viro @ 2025-02-01 22:56 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-fsdevel
A couple of unrelated patches - one is a removal of long-obsolete
include in overlayfs (it used to need fs/internal.h, but the extern
it wanted has been moved back to include/linux/namei.h) and another
introduces convenience helper constructing struct qstr by
a NUL-terminated string.
One trivial conflict in fs/bcachefs/recovery.c - in mainline
bch2_btree_lost_data() goes from returning void to returning int,
in this branch a #define two lines before that point is removed.
The following changes since commit 40384c840ea1944d7c5a392e8975ed088ecf0b37:
Linux 6.13-rc1 (2024-12-01 14:28:56 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git tags/pull-misc
for you to fetch changes up to c1feab95e0b2e9fce7e4f4b2739baf40d84543af:
add a string-to-qstr constructor (2025-01-27 19:25:45 -0500)
----------------------------------------------------------------
assorted stuff for this merge window
----------------------------------------------------------------
Al Viro (2):
fs/overlayfs/namei.c: get rid of include ../internal.h
add a string-to-qstr constructor
fs/anon_inodes.c | 4 ++--
fs/bcachefs/fsck.c | 2 +-
fs/bcachefs/recovery.c | 2 --
fs/bcachefs/util.h | 2 --
fs/erofs/xattr.c | 2 +-
fs/file_table.c | 4 +---
fs/kernfs/file.c | 2 +-
fs/overlayfs/namei.c | 2 --
include/linux/dcache.h | 1 +
mm/secretmem.c | 3 +--
net/sunrpc/rpc_pipe.c | 14 +++++---------
11 files changed, 13 insertions(+), 25 deletions(-)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [git pull] a couple of misc vfs patches
2025-02-01 22:56 [git pull] a couple of misc vfs patches Al Viro
@ 2025-02-01 23:25 ` pr-tracker-bot
0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2025-02-01 23:25 UTC (permalink / raw)
To: Al Viro; +Cc: Linus Torvalds, linux-fsdevel
The pull request you sent on Sat, 1 Feb 2025 22:56:51 +0000:
> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git tags/pull-misc
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a86bf2283d2c9769205407e2b54777c03d012939
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-02-01 23:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-01 22:56 [git pull] a couple of misc vfs patches Al Viro
2025-02-01 23:25 ` pr-tracker-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).