Merge branch 'master' of master.kernel.org:/pub/scm/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>
Showing
- Documentation/feature-removal-schedule.txt 8 additions, 19 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/networking/ip-sysctl.txt 1 addition, 2 deletionsDocumentation/networking/ip-sysctl.txt
- Documentation/networking/l2tp.txt 169 additions, 0 deletionsDocumentation/networking/l2tp.txt
- Documentation/networking/multiqueue.txt 111 additions, 0 deletionsDocumentation/networking/multiqueue.txt
- Documentation/networking/netdevices.txt 32 additions, 6 deletionsDocumentation/networking/netdevices.txt
- MAINTAINERS 5 additions, 0 deletionsMAINTAINERS
- arch/ppc/8260_io/enet.c 2 additions, 2 deletionsarch/ppc/8260_io/enet.c
- arch/ppc/8260_io/fcc_enet.c 2 additions, 2 deletionsarch/ppc/8260_io/fcc_enet.c
- arch/ppc/8xx_io/enet.c 2 additions, 2 deletionsarch/ppc/8xx_io/enet.c
- arch/ppc/8xx_io/fec.c 1 addition, 1 deletionarch/ppc/8xx_io/fec.c
- drivers/bluetooth/hci_usb.c 2 additions, 86 deletionsdrivers/bluetooth/hci_usb.c
- drivers/bluetooth/hci_usb.h 2 additions, 3 deletionsdrivers/bluetooth/hci_usb.h
- drivers/bluetooth/hci_vhci.c 0 additions, 6 deletionsdrivers/bluetooth/hci_vhci.c
- drivers/net/3c523.c 1 addition, 1 deletiondrivers/net/3c523.c
- drivers/net/7990.c 2 additions, 2 deletionsdrivers/net/7990.c
- drivers/net/8139too.c 1 addition, 1 deletiondrivers/net/8139too.c
- drivers/net/Kconfig 21 additions, 0 deletionsdrivers/net/Kconfig
- drivers/net/Makefile 1 addition, 0 deletionsdrivers/net/Makefile
- drivers/net/a2065.c 2 additions, 2 deletionsdrivers/net/a2065.c
- drivers/net/ariadne.c 1 addition, 1 deletiondrivers/net/ariadne.c
Loading
Please register or sign in to comment