diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-02 16:16:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-02 16:16:53 -0400 |
| commit | 9f0d34bc344889c2e6c593bd949d7ab821f0f4a5 (patch) | |
| tree | e5bfc776a09315afa4dbcae97ac04f2cca239c96 /kernel/sysctl.c | |
| parent | e4a924f5768c55002c02ceba9b9f86824c35f956 (diff) | |
| parent | 0a4812798fae4f6bfcaab51e31b3898ff5ea3108 (diff) | |
| download | op-kernel-dev-9f0d34bc344889c2e6c593bd949d7ab821f0f4a5.zip op-kernel-dev-9f0d34bc344889c2e6c593bd949d7ab821f0f4a5.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/asix_common.c
drivers/net/usb/sr9800.c
drivers/net/usb/usbnet.c
include/linux/usb/usbnet.h
net/ipv4/tcp_ipv4.c
net/ipv6/tcp_ipv6.c
The TCP conflicts were overlapping changes. In 'net' we added a
READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
Eric Dumazet touched the surrounding code dealing with how mini
sockets are handled.
With USB, it's a case of the same bug fix first going into net-next
and then I cherry picked it back into net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 88ea2d6..ce410bb 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1228,6 +1228,14 @@ static struct ctl_table vm_table[] = { .extra1 = &zero, }, { + .procname = "dirtytime_expire_seconds", + .data = &dirtytime_expire_interval, + .maxlen = sizeof(dirty_expire_interval), + .mode = 0644, + .proc_handler = dirtytime_interval_handler, + .extra1 = &zero, + }, + { .procname = "nr_pdflush_threads", .mode = 0444 /* read-only */, .proc_handler = pdflush_proc_obsolete, |
