commit 335fb8fc71692830aca0a5a5fe7f60016ee0d0aa Merge: b8fceee... c69c089... Author: Linus Torvalds Date: Thu Sep 20 13:25:35 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] ahci: add ATI SB800 PCI IDs libata-sff: Fix documentation libata: Update the blacklist with a few more devices commit b8fceee17a310f189188599a8fa5e9beaff57eb0 Author: Davide Libenzi Date: Thu Sep 20 12:40:16 2007 -0700 signalfd simplification This simplifies signalfd code, by avoiding it to remain attached to the sighand during its lifetime. In this way, the signalfd remain attached to the sighand only during poll(2) (and select and epoll) and read(2). This also allows to remove all the custom "tsk == current" checks in kernel/signal.c, since dequeue_signal() will only be called by "current". I think this is also what Ben was suggesting time ago. The external effect of this, is that a thread can extract only its own private signals and the group ones. I think this is an acceptable behaviour, in that those are the signals the thread would be able to fetch w/out signalfd. Signed-off-by: Davide Libenzi Signed-off-by: Linus Torvalds commit 9db619e66503494e41159de3c76fafabe80d016b Author: Wolfgang Walter Date: Thu Sep 20 15:51:46 2007 -0400 rpc: fix garbage in printk in svc_tcp_accept() we upgraded the kernel of a nfs-server from 2.6.17.11 to 2.6.22.6. Since then we get the message lockd: too many open TCP sockets, consider increasing the number of nfsd threads lockd: last TCP connect from ^\\236^\É^D These random characters in the second line are caused by a bug in svc_tcp_accept. (Note: there are two previous __svc_print_addr(sin, buf, sizeof(buf)) calls in this function, either of which would initialize buf correctly; but both are inside "if"'s and are not necessarily executed. This is less obvious in the second case, which is inside a dprintk(), which is a macro which expands to an if statement.) Signed-off-by: Wolfgang Walter Signed-off-by: J. Bruce Fields Signed-off-by: Linus Torvalds commit c69c0892d8dd68b01a9fced5cab8527f0698c15e Author: henry su Date: Thu Sep 20 16:07:33 2007 -0400 [libata] ahci: add ATI SB800 PCI IDs ATI/AMD SB800 shares some device IDs with SB700, and SB800 adds two more device IDs:0x4394,0x4395. Signed-off-by: henry su Signed-off-by: Jeff Garzik commit e1cc9de8361f267101402a1181cff4d3d3225a6d Author: Alan Cox Date: Thu Sep 20 15:03:07 2007 +0100 libata-sff: Fix documentation Code moved to ioread/iowrite but the comment didn't Also note a posting issue Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 0e3dbc01d53940fe10e5a5cfec15ede3e929c918 Author: Alan Cox Date: Thu Sep 20 15:22:47 2007 +0100 libata: Update the blacklist with a few more devices Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit f685ddaf0fc9b9f53eb9346c858664776becf5d9 Merge: 460edb3... cd46171... Author: Linus Torvalds Date: Thu Sep 20 12:42:47 2007 -0700 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: [BNX2]: Add PHY workaround for 5709 A1. [PPP] L2TP: Fix skb handling in pppol2tp_xmit [PPP] L2TP: Fix skb handling in pppol2tp_recv_core [PPP] L2TP: Disallow non-UDP datagram sockets [PPP] pppoe: Fix double-free on skb after transmit failure [PKT_SCHED]: Fix 'SFQ qdisc crashes with limit of 2 packets' [NETFILTER]: MAINTAINERS update [NETFILTER]: nfnetlink_log: fix sending of multipart messages commit 460edb3cd06865ffb231eb694b567daec3113210 Merge: be7963b7e... faf60e7... Author: Linus Torvalds Date: Thu Sep 20 12:42:23 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: sky2: version 1.18 sky2: receive FIFO checking sky2: fe+ chip support sky2: reorganize chip revision features sky2: ethtool speed report bug sky2: fix VLAN receive processing (resend) phy: export phy_mii_ioctl myri10ge: Add support for PCI device id 9 commit faf60e72d07d163a623e47269680918fccaa789a Author: Stephen Hemminger Date: Wed Sep 19 15:36:47 2007 -0700 sky2: version 1.18 Update version number Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 75e806838a3327d4ca9030e588d34de11b04f341 Author: Stephen Hemminger Date: Wed Sep 19 15:36:46 2007 -0700 sky2: receive FIFO checking A driver writer from another operating system hinted that the versions of Yukon 2 chip with rambuffer (EC and XL) have a hardware bug that if the FIFO ever gets completely full it will hang. Sounds like a classic ring full vs ring empty wrap around bug. As a workaround, use the existing watchdog timer to check for ring full lockup. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 05745c4ab1c58fbb6ab8e8d3a40e0e395d7e2b0e Author: Stephen Hemminger Date: Wed Sep 19 15:36:45 2007 -0700 sky2: fe+ chip support Add support for newest Marvell chips. The Yukon FE plus chip is found in some not yet released laptops. Tested on hardware evaluation boards. This version of the patch is for 2.6.23. It supersedes the two previous patches that are sitting in netdev-2.6 (upstream branch). Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit ea76e63598eb312e5d33a782275be91038fc6df2 Author: Stephen Hemminger Date: Wed Sep 19 15:36:44 2007 -0700 sky2: reorganize chip revision features This patch should cause no functional changes in driver behaviour. There are (too) many revisions of the Yukon 2 chip now. Instead of adding more conditionals based on chip revision; rerganize into a set of feature flags so adding new versions is less problematic. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit c99210b50fe741026d86fdcb5f3f5a0c00c503cc Author: Stephen Hemminger Date: Wed Sep 19 15:36:43 2007 -0700 sky2: ethtool speed report bug On 100mbit versions, the driver always reports gigabit speed available. The correct modes are already computed, then overwritten. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit d6532232cd3de79c852685823a9c52f723816d0a Author: Stephen Hemminger Date: Wed Sep 19 15:36:42 2007 -0700 sky2: fix VLAN receive processing (resend) The length check for truncated frames was not correctly handling the case where VLAN acceleration had already read the tag. Also, the Yukon EX has some features that use high bit of status as security tag. Signed-off-by: Pierre-Yves Ritschard Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit be7963b7e7f08a149e247c0bf29a4abd174e0929 Author: Stefan Richter Date: Thu Sep 20 21:17:33 2007 +0200 ieee1394: ohci1394: fix initialization if built non-modular Initialization of ohci1394 was broken according to one reporter if the driver was statically linked, i.e. not built as loadable module. Dmesg: PCI: Device 0000:02:07.0 not available because of resource collisions ohci1394: Failed to enable OHCI hardware. This was reported for a Toshiba Satellite 5100-503. The cause is commit 8df4083c5291b3647e0381d3c69ab2196f5dd3b7 in Linux 2.6.19-rc1 which only served purposes of early remote debugging via FireWire. This functionality is better provided by the currently out-of-tree driver ohci1394_earlyinit. Reversal of the commit was OK'd by Andi Kleen. Signed-off-by: Stefan Richter commit cd46171c7297739dc7e46d885862e98023eab9c7 Author: Michael Chan Date: Thu Sep 20 11:04:58 2007 -0700 [BNX2]: Add PHY workaround for 5709 A1. Add the DIS_EARLY_DAC PHY workaround for 5709 A1. Without it, link sometimes does not come up. Update version to 1.6.5. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit f3d5e3a4155b6f42f6f6f0a2cc95ca0adbabe1af Author: Herbert Xu Date: Wed Sep 19 10:46:28 2007 -0700 [PPP] L2TP: Fix skb handling in pppol2tp_xmit This patch makes pppol2tp_xmit call skb_cow_head so that we don't modify cloned skb data. It also gets rid of skb2 we only need to preserve the original skb for congestion notification, which is only applicable for ppp_async and ppp_sync. The other semantic change made here is the removal of socket accounting for data tranmitted out of pppol2tp_xmit. The original code leaked any existing socket skb accounting. We could fix this by dropping the original skb owner. However, this is undesirable as the packet has not physically left the host yet. In fact, all other tunnels in the kernel do not account skb's passing through to their own socket. In partciular, ESP over UDP does not do so and it is the closest tunnel type to PPPoL2TP. So this patch simply removes the socket accounting in pppol2tp_xmit. The accounting still applies to control packets of course. I've also added a reminder that the outgoing checksum here doesn't work. I suppose existing deployments don't actually enable checksums. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 7a70e39b6633ad85936b029463134ee2599600f1 Author: Herbert Xu Date: Tue Sep 18 13:18:42 2007 -0700 [PPP] L2TP: Fix skb handling in pppol2tp_recv_core The function pppol2tp_recv_core doesn't handle non-linear packets properly. It also fails to check the remote offset field. This patch fixes these problems. It also removes an unnecessary check on the UDP header which has already been performed by the UDP layer. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit a14d6abc947a5504e8d0f934da57b5bc4cea59ca Author: Herbert Xu Date: Tue Sep 18 13:18:17 2007 -0700 [PPP] L2TP: Disallow non-UDP datagram sockets With the addition of UDP-Lite we need to refine the socket check so that only genuine UDP sockets are allowed through. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 21d0c83302fb742b7ffb6089d40196166102f5ed Author: Herbert Xu Date: Wed Sep 19 10:45:02 2007 -0700 [PPP] pppoe: Fix double-free on skb after transmit failure When I got rid of the second packet in __pppoe_xmit I created a double-free on the skb because of the goto abort on failure. This patch removes that. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 5588b40d7c2bff75ee573ed42d1738c73ce24492 Author: Alexey Kuznetsov Date: Wed Sep 19 10:42:03 2007 -0700 [PKT_SCHED]: Fix 'SFQ qdisc crashes with limit of 2 packets' Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 1a03b81db96aeaac0276224f25c0701a1ba37318 Author: Patrick McHardy Date: Tue Sep 18 13:19:26 2007 -0700 [NETFILTER]: MAINTAINERS update Update netfilter list addresses and an old email address of myself. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 29c5d4afba51c71cfeadd3f74f3c42e064483fb0 Author: Eric Leblond Date: Tue Sep 18 13:07:15 2007 -0700 [NETFILTER]: nfnetlink_log: fix sending of multipart messages The following patch fixes the handling of netlink packets containing multiple messages. As exposed during netfilter workshop, nfnetlink_log was overwritten the message type of the last message (setting it to MSG_DONE) in a multipart packet. The consequence was libnfnetlink to ignore the last message in the packet. The following patch adds a supplementary message (with type MSG_DONE) af the end of the netlink skb. Signed-off-by: Eric Leblond Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6d0b842d3bf0cc027dcff57a89fb8a6b1fd610e1 Author: Linus Torvalds Date: Thu Sep 20 11:33:45 2007 -0700 Fix CRLF line endings in Documentation/input/iforce-protocol.txt Emil Medve points out that this documentation file uses CRLF line endings, which means that if you use [core] autocrlf=input (which makes sense if you ever develop under Windows, for example, or if you use other broken tools) in your git config, git will always complain about the file being dirty. This removes the bogus DOS line endings, and removes whitespace at the end of line. Cc: Emil Medve Signed-off-by: Linus Torvalds commit bbc15f46fe4dc2862325e2b4ba474a854162e1a1 Author: Paul Bolle Date: Mon Sep 10 23:39:02 2007 +0200 [x86 setup] Fix typo in arch/i386/boot/header.S There's an obvious typo in arch/i386/boot/header.S (in your linux-2.6-x86setup.git) that I noticed by just studying the code. Signed-off-by: Paul Bolle Signed-off-by: H. Peter Anvin commit 91c4b8cb5ab8cc3e8352739e35699c0487a6b6f3 Author: H. Peter Anvin Date: Thu Sep 13 14:16:37 2007 -0700 [acpi] Correct the decoding of video mode numbers in wakeup.S wakeup.S looks at the video mode number from the setup header and looks to see if it is a VESA mode. Unfortunately, the decoding is done incorrectly and it will attempt to frob the VESA BIOS for any mode number 0x0200 or larger. Correct this, and remove a bunch of #if 0'd code. Massive thanks to Jeff Chua for reporting the bug, and suffering though a large number of experiments in order to track this problem down. Cc: Pavel Machek Signed-off-by: H. Peter Anvin commit 3f662b3f6e422a15fefcbaf4bdd21f97e6bcf32d Author: H. Peter Anvin Date: Thu Sep 13 14:14:29 2007 -0700 [x86 setup] Present the canonical video mode number to the kernel Canonicalize the video mode number as presented to the kernel. The video mode number may be user-entered (e.g. ASK_VGA), an alias (e.g. NORMAL_VGA), or a size specification, and that confuses the suspend wakeup code. Signed-off-by: H. Peter Anvin commit 680e9fe9d69ea86e81c859932bfd751be91cc0e0 Author: Domen Puncer Date: Mon Sep 17 22:21:40 2007 +0200 phy: export phy_mii_ioctl Export phy_mii_ioctl, so network drivers can use it when built as modules too. Signed-off-by: Domen Puncer Signed-off-by: Jeff Garzik commit a07bc1ffaeee9f05490193f66915ac086c6ea5c9 Author: Brice Goglin Date: Fri Sep 14 00:40:14 2007 +0200 myri10ge: Add support for PCI device id 9 Add support for new Myri-10G boards with PCI device id 9. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik