Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 4 insertions, 4 deletions

diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
index a5a1856234e7..563943822e58 100644
--- a/net/dccp/sysctl.c
+++ b/net/dccp/sysctl.c
@@ -93,13 +93,13 @@ static struct ctl_table dccp_default_table[] = {
                 .proc_handler   = proc_dointvec_ms_jiffies,
         },
 
-        { .ctl_name = 0, }
+        { }
 };
 
 static struct ctl_path dccp_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "dccp", .ctl_name = NET_DCCP, },
-        { .procname = "default", .ctl_name = NET_DCCP_DEFAULT, },
+        { .procname = "net", },
+        { .procname = "dccp", },
+        { .procname = "default", },
         { }
 };