Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 038a5008 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

: (867 commits)
  [SKY2]: status polling loop (post merge)
  [NET]: Fix NAPI completion handling in some drivers.
  [TCP]: Limit processing lost_retrans loop to work-to-do cases
  [TCP]: Fix lost_retrans loop vs fastpath problems
  [TCP]: No need to re-count fackets_out/sacked_out at RTO
  [TCP]: Extract tcp_match_queue_to_sack from sacktag code
  [TCP]: Kill almost unused variable pcount from sacktag
  [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
  [TCP]: Add bytes_acked (ABC) clearing to FRTO too
  [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
  [NETFILTER]: x_tables: add missing ip6t_modulename aliases
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening
  [QETH]: fix qeth_main.c
  [NETLINK]: fib_frontend build fixes
  [IPv6]: Export userland ND options through netlink (RDNSS support)
  [9P]: build fix with !CONFIG_SYSCTL
  [NET]: Fix dev_put() and dev_hold() comments
  [NET]: make netlink user -> kernel interface synchronious
  [NET]: unify netlink kernel socket recognition
  [NET]: cleanup 3rd argument in netlink_sendskb
  ...

Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.

(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parents dd6d1844 26691830

CREDITS

+31 −0
Original line number Diff line number Diff line
@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /proc/pid/maps protection 
S: (ask for current address)

S: USA



N: Robin Cornelius

E: robincornelius@users.sourceforge.net

D: Ralink rt2x00 WLAN driver

S: Cornwall, U.K.



N: Mark Corner

E: mcorner@umich.edu

W: http://www.eecs.umich.edu/~mcorner/
@@ -679,6 +684,11 @@ D: Kernel module SMART utilities 
S: Santa Cruz, California

S: USA



N: Luis Correia

E: lfcorreia@users.sf.net

D: Ralink rt2x00 WLAN driver

S: Belas, Portugal



N: Alan Cox

W: http://www.linux.org.uk/diary/

D: Linux Networking (0.99.10->2.0.29)
@@ -833,6 +843,12 @@ S: Lancs 
S: PR4 6AX

S: United Kingdom



N: Ivo van Doorn

E: IvDoorn@gmail.com

W: http://www.mendiosus.nl

D: Ralink rt2x00 WLAN driver

S: Haarlem, The Netherlands



N: John G Dorsey

E: john+@cs.cmu.edu

D: ARM Linux ports to Assabet/Neponset, Spot
@@ -3517,6 +3533,12 @@ S: Maastrichterweg 63 
S: 5554 GG Valkenswaard

S: The Netherlands



N: Mark Wallis

E: mwallis@serialmonkey.com

W: http://mark.serialmonkey.com

D: Ralink rt2x00 WLAN driver

S: Newcastle, Australia



N: Peter Shaobo Wang

E: pwang@mmdcorp.com

W: http://www.mmdcorp.com/pw/linux
@@ -3651,6 +3673,15 @@ S: Alte Regensburger Str. 11a 
S: 93149 Nittenau

S: Germany



N: Gertjan van Wingerde

E: gwingerde@home.nl

D: Ralink rt2x00 WLAN driver

D: Minix V2 file-system

D: Misc fixes

S: Geessinkweg 177

S: 7544 TX Enschede

S: The Netherlands



N: Lars Wirzenius

E: liw@iki.fi

D: Linux System Administrator's Guide, author, former maintainer

Documentation/DocBook/kernel-api.tmpl

+7 −1
Original line number Diff line number Diff line
@@ -240,17 +240,23 @@ X!Ilib/string.c 
     <sect1><title>Driver Support</title>

!Enet/core/dev.c

!Enet/ethernet/eth.c

!Enet/sched/sch_generic.c

!Iinclude/linux/etherdevice.h

!Iinclude/linux/netdevice.h

     </sect1>

     <sect1><title>PHY Support</title>

!Edrivers/net/phy/phy.c

!Idrivers/net/phy/phy.c

!Edrivers/net/phy/phy_device.c

!Idrivers/net/phy/phy_device.c

!Edrivers/net/phy/mdio_bus.c

!Idrivers/net/phy/mdio_bus.c

     </sect1>

<!-- FIXME: Removed for now since no structured comments in source

     <sect1><title>Wireless</title>

X!Enet/core/wireless.c

-->

     </sect1>

-->

     <sect1><title>Synchronous PPP</title>

!Edrivers/net/wan/syncppp.c

     </sect1>

Documentation/feature-removal-schedule.txt

+13 −0
Original line number Diff line number Diff line
@@ -314,3 +314,16 @@ Why: The i386/x86_64 merge provides a symlink to the old bzImage 
	location so not yet updated user space tools, e.g. package

	scripts, do not break.

Who:	Thomas Gleixner <tglx@linutronix.de>



---------------------------



What:	shaper network driver

When:	January 2008

Files:	drivers/net/shaper.c, include/linux/if_shaper.h

Why:	This driver has been marked obsolete for many years.

	It was only designed to work on lower speed links and has design

	flaws that lead to machine crashes. The qdisc infrastructure in

	2.4 or later kernels, provides richer features and is more robust.

Who:	Stephen Hemminger <shemminger@linux-foundation.org>



---------------------------