From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 12 Jul 2007 20:31:22 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e1bd2ac5a6b7a8b625e40c9e9f8b6dea4cf22f85;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (183 commits)
  [TG3]: Update version to 3.78.
  [TG3]: Add missing NVRAM strapping.
  [TG3]: Enable auto MDI.
  [TG3]: Fix the polarity bit.
  [TG3]: Fix irq_sync race condition.
  [NET_SCHED]: ematch: module autoloading
  [TCP]: tcp probe wraparound handling and other changes
  [RTNETLINK]: rtnl_link: allow specifying initial device address
  [RTNETLINK]: rtnl_link API simplification
  [VLAN]: Fix MAC address handling
  [ETH]: Validate address in eth_mac_addr
  [NET]: Fix races in net_rx_action vs netpoll.
  [AF_UNIX]: Rewrite garbage collector, fixes race.
  [NETFILTER]: {ip, nf}_conntrack_sctp: fix remotely triggerable NULL ptr dereference (CVE-2007-2876)
  [NET]: Make all initialized struct seq_operations const.
  [UDP]: Fix length check.
  [IPV6]: Remove unneeded pointer idev from addrconf_cleanup().
  [DECNET]: Another unnecessary net/tcp.h inclusion in net/dn.h
  [IPV6]: Make IPV6_{RECV,2292}RTHDR boolean options.
  [IPV6]: Do not send RH0 anymore.
  ...

Fixed up trivial conflict in Documentation/feature-removal-schedule.txt
manually.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

e1bd2ac5a6b7a8b625e40c9e9f8b6dea4cf22f85
diff --cc Documentation/feature-removal-schedule.txt
index 281458b47d75,062fc2e79c86..0599a0c7c026
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -330,10 -311,11 +311,18 @@@ Who:  Tejun Heo <htejun@gmail.com
  
  ---------------------------
  
 +What:	Legacy RTC drivers (under drivers/i2c/chips)
 +When:	November 2007
 +Why:	Obsolete. We have a RTC subsystem with better drivers.
 +Who:	Jean Delvare <khali@linux-fr.org>
 +
 +---------------------------
 +
+ What:	iptables SAME target
+ When:	1.1. 2008
+ Files:	net/ipv4/netfilter/ipt_SAME.c, include/linux/netfilter_ipv4/ipt_SAME.h
+ Why:	Obsolete for multiple years now, NAT core provides the same behaviour.
+ 	Unfixable broken wrt. 32/64 bit cleanness.
+ Who:	Patrick McHardy <kaber@trash.net>
+ 
+ ---------------------------