diff options
author | 2024-11-26 18:15:06 +0100 | |
---|---|---|
committer | 2024-11-26 18:15:06 +0100 | |
commit | cf87766dd6f9ddcceaa8ee26e3cbd7538e42dd19 (patch) | |
tree | 8531685628a090333db2f874688ac07624b51072 /kernel/sysctl.c | |
parent | fs_parser: update mount_api doc to match function signature (diff) | |
parent | fs/backing_file: fix wrong argument in callback (diff) | |
download | wireguard-linux-cf87766dd6f9ddcceaa8ee26e3cbd7538e42dd19.tar.xz wireguard-linux-cf87766dd6f9ddcceaa8ee26e3cbd7538e42dd19.zip |
Merge branch 'ovl.fixes'
Bring in an overlayfs fix for v6.13-rc1 that fixes a bug introduced by
the overlayfs changes merged for v6.13.
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 79e6cb1d5c48..5c9202cb8f59 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1305,7 +1305,6 @@ int proc_dointvec_userhz_jiffies(const struct ctl_table *table, int write, * @write: %TRUE if this is a write to the sysctl file * @buffer: the user buffer * @lenp: the size of the user buffer - * @ppos: file position * @ppos: the current position in the file * * Reads/writes up to table->maxlen/sizeof(unsigned int) integer |