diff options
| author |   Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-12-11 15:06:05 -0500 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-12-11 15:06:05 -0500 |
| commit | e7f0a3a6f7339af55f1ca2c27131739d75569c08 (patch) | |
| tree | b4e84b5457f175227c5fc85869108164d47813c9 /kernel/sysctl.c | |
| parent | drm/i915/dp: move g4x_dp_set_clock() call to g4x_dp_compute_config() (diff) | |
| parent | Linux 6.13-rc2 (diff) | |
| download | wireguard-linux-e7f0a3a6f7339af55f1ca2c27131739d75569c08.tar.xz wireguard-linux-e7f0a3a6f7339af55f1ca2c27131739d75569c08.zip | |
Merge drm/drm-next into drm-intel-next
Catching up with 6.13-rc2.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
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 |