| commit | 0a4c2a134ce4ef478b1f439cedac92583a553fe8 | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Fri Oct 03 14:53:25 2025 -0400 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Fri Oct 03 15:01:39 2025 -0400 |
| tree | 9c153b0856fe99522613defcf1bfe829fbc13c3d | |
| parent | 2f7d98f10b8f64525b2c74cae7d70ae5278eb654 [diff] | |
| parent | 9b0d551bcc05fa4786689544a2845024db1d41b6 [diff] |
Merge remote-tracking branch 'origin' into proposed.merge conflicts: * fs/namei.c, include/linux/namei.h: mainline has done_path_create() renamed to end_creating_path() * include/linux/namei.h: end_removing_path() (a wrapper for end_creating_path()) needs argument constified as well * fs/open.c: trivial conflict in finish_no_open() * fs/nsfs.c: nsfs_export_open() needs argument constified (new instance of a method added in mainline) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>