Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Nov 2007 04:09:07 +0000 (20:09 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Nov 2007 04:09:07 +0000 (20:09 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/net-2.6: (41 commits)
  [XFRM]: Fix leak of expired xfrm_states
  [ATM]: [he] initialize lock and tasklet earlier
  [IPV4]: Remove bogus ifdef mess in arp_process
  [SKBUFF]: Free old skb properly in skb_morph
  [IPV4]: Fix memory leak in inet_hashtables.h when NUMA is on
  [IPSEC]: Temporarily remove locks around copying of non-atomic fields
  [TCP] MTUprobe: Cleanup send queue check (no need to loop)
  [TCP]: MTUprobe: receiver window & data available checks fixed
  [MAINTAINERS]: tlan list is subscribers-only
  [SUNRPC]: Remove SPIN_LOCK_UNLOCKED
  [SUNRPC]: Make xprtsock.c:xs_setup_{udp,tcp}() static
  [PFKEY]: Sending an SADB_GET responds with an SADB_GET
  [IRDA]: Compilation for CONFIG_INET=n case
  [IPVS]: Fix compiler warning about unused register_ip_vs_protocol
  [ARP]: Fix arp reply when sender ip 0
  [IPV6] TCPMD5: Fix deleting key operation.
  [IPV6] TCPMD5: Check return value of tcp_alloc_md5sig_pool().
  [IPV4] TCPMD5: Use memmove() instead of memcpy() because we have overlaps.
  [IPV4] TCPMD5: Omit redundant NULL check for kfree() argument.
  ieee80211: Stop net_ratelimit/IEEE80211_DEBUG_DROP log pollution
  ...

1  2 
MAINTAINERS
kernel/sysctl_check.c

diff --combined MAINTAINERS
index b21a911193e8e9737e097b54a8d8e6a90cc7a96f,695551a1519d6036476dbf87ff69344456d38d1b..f5bd9bab7ed6eb3b2db50af5cffcd255e3846c72
@@@ -1914,8 -1914,10 +1914,8 @@@ L:     linux1394-devel@lists.sourceforge.ne
  S:    Maintained
  
  IMS TWINTURBO FRAMEBUFFER DRIVER
 -P:    Paul Mundt
 -M:    lethal@chaoticdreams.org
  L:    linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 -S:    Maintained
 +S:    Orphan
  
  INFINIBAND SUBSYSTEM
  P:    Roland Dreier
@@@ -2444,7 -2446,7 +2444,7 @@@ M68K ON APPLE MACINTOS
  P:    Joshua Thompson
  M:    funaho@jurai.org
  W:    http://www.mac.linux-m68k.org/
 -L:    linux-mac68k@mac.linux-m68k.org
 +L:    linux-m68k@lists.linux-m68k.org
  S:    Maintained
  
  M68K ON HP9000/300
@@@ -3634,12 -3636,18 +3634,12 @@@ M:   laredo@gnu.or
  W:    http://www.stradis.com/
  S:    Maintained
  
 -SUPERH (sh)
 -P:    Paul Mundt
 -M:    lethal@linux-sh.org
 -L:    linuxsh-dev@lists.sourceforge.net (subscribers-only)
 -W:    http://www.linux-sh.org
 -S:    Maintained
 -
 -SUPERH64 (sh64)
 +SUPERH
  P:    Paul Mundt
  M:    lethal@linux-sh.org
 -L:    linuxsh-shmedia-dev@lists.sourceforge.net
 +L:    linux-sh@vger.kernel.org
  W:    http://www.linux-sh.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git
  S:    Maintained
  
  SUN3/3X
@@@ -3725,7 -3733,7 +3725,7 @@@ S:      Maintaine
  TLAN NETWORK DRIVER
  P:    Samuel Chessman
  M:    chessman@tux.org
- L:    tlan-devel@lists.sourceforge.net
+ L:    tlan-devel@lists.sourceforge.net (subscribers-only)
  W:    http://sourceforge.net/projects/tlan/
  S:    Maintained
  
diff --combined kernel/sysctl_check.c
index 8f5baac1eb08e68ed254031e592c031745c070da,fdfca0dd990526afd7e034c583574abe736071ba..6972f26c65f74d7b3751836d9523f95fef245848
@@@ -140,6 -140,9 +140,6 @@@ static struct trans_ctl_table trans_vm_
        { VM_PANIC_ON_OOM,              "panic_on_oom" },
        { VM_VDSO_ENABLED,              "vdso_enabled" },
        { VM_MIN_SLAB,                  "min_slab_ratio" },
 -      { VM_CMM_PAGES,                 "cmm_pages" },
 -      { VM_CMM_TIMED_PAGES,           "cmm_timed_pages" },
 -      { VM_CMM_TIMEOUT,               "cmm_timeout" },
  
        {}
  };
@@@ -234,36 -237,6 +234,6 @@@ static struct trans_ctl_table trans_net
        {}
  };
  
- static struct trans_ctl_table trans_net_ipv4_vs_table[] = {
-       { NET_IPV4_VS_AMEMTHRESH,       "amemthresh" },
-       { NET_IPV4_VS_DEBUG_LEVEL,      "debug_level" },
-       { NET_IPV4_VS_AMDROPRATE,       "am_droprate" },
-       { NET_IPV4_VS_DROP_ENTRY,       "drop_entry" },
-       { NET_IPV4_VS_DROP_PACKET,      "drop_packet" },
-       { NET_IPV4_VS_SECURE_TCP,       "secure_tcp" },
-       { NET_IPV4_VS_TO_ES,            "timeout_established" },
-       { NET_IPV4_VS_TO_SS,            "timeout_synsent" },
-       { NET_IPV4_VS_TO_SR,            "timeout_synrecv" },
-       { NET_IPV4_VS_TO_FW,            "timeout_finwait" },
-       { NET_IPV4_VS_TO_TW,            "timeout_timewait" },
-       { NET_IPV4_VS_TO_CL,            "timeout_close" },
-       { NET_IPV4_VS_TO_CW,            "timeout_closewait" },
-       { NET_IPV4_VS_TO_LA,            "timeout_lastack" },
-       { NET_IPV4_VS_TO_LI,            "timeout_listen" },
-       { NET_IPV4_VS_TO_SA,            "timeout_synack" },
-       { NET_IPV4_VS_TO_UDP,           "timeout_udp" },
-       { NET_IPV4_VS_TO_ICMP,          "timeout_icmp" },
-       { NET_IPV4_VS_CACHE_BYPASS,     "cache_bypass" },
-       { NET_IPV4_VS_EXPIRE_NODEST_CONN,       "expire_nodest_conn" },
-       { NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE,        "expire_quiescent_template" },
-       { NET_IPV4_VS_SYNC_THRESHOLD,           "sync_threshold" },
-       { NET_IPV4_VS_NAT_ICMP_SEND,    "nat_icmp_send" },
-       { NET_IPV4_VS_LBLC_EXPIRE,              "lblc_expiration" },
-       { NET_IPV4_VS_LBLCR_EXPIRE,             "lblcr_expiration" },
-       {}
- };
  static struct trans_ctl_table trans_net_neigh_vars_table[] = {
        { NET_NEIGH_MCAST_SOLICIT,      "mcast_solicit" },
        { NET_NEIGH_UCAST_SOLICIT,      "ucast_solicit" },
@@@ -338,7 -311,6 +308,6 @@@ static struct trans_ctl_table trans_net
        { NET_IPV4_ROUTE,               "route",        trans_net_ipv4_route_table },
        /* NET_IPV4_FIB_HASH unused */
        { NET_IPV4_NETFILTER,           "netfilter",    trans_net_ipv4_netfilter_table },
-       { NET_IPV4_VS,                  "vs",           trans_net_ipv4_vs_table },
  
        { NET_IPV4_TCP_TIMESTAMPS,              "tcp_timestamps" },
        { NET_IPV4_TCP_WINDOW_SCALING,          "tcp_window_scaling" },
@@@ -1216,6 -1188,16 +1185,6 @@@ static struct trans_ctl_table trans_arl
        {}
  };
  
 -static struct trans_ctl_table trans_appldata_table[] = {
 -      { CTL_APPLDATA_TIMER,           "timer" },
 -      { CTL_APPLDATA_INTERVAL,        "interval" },
 -      { CTL_APPLDATA_OS,              "os" },
 -      { CTL_APPLDATA_NET_SUM,         "net_sum" },
 -      { CTL_APPLDATA_MEM,             "mem" },
 -      {}
 -
 -};
 -
  static struct trans_ctl_table trans_s390dbf_table[] = {
        { 5678 /* CTL_S390DBF_STOPPABLE */,     "debug_stoppable" },
        { 5679 /* CTL_S390DBF_ACTIVE */,        "debug_active" },
@@@ -1260,6 -1242,7 +1229,6 @@@ static struct trans_ctl_table trans_roo
        { CTL_ABI,      "abi" },
        /* CTL_CPU not used */
        { CTL_ARLAN,    "arlan",        trans_arlan_table },
 -      { CTL_APPLDATA, "appldata",     trans_appldata_table },
        { CTL_S390DBF,  "s390dbf",      trans_s390dbf_table },
        { CTL_SUNRPC,   "sunrpc",       trans_sunrpc_table },
        { CTL_PM,       "pm",           trans_pm_table },