commit 28e8351ac22de25034e048c680014ad824323c65 Merge: 3b993e8... d18c4d6... Author: Linus Torvalds Date: Tue Aug 14 10:00:29 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: [GFS2] Revert remounting w/o acl option leaves acls enabled [GFS2] Fix setting of inherit jdata attr [GFS2] Fix incorrect error path in prepare_write() [GFS2] Fix incorrect return code in rgrp.c [GFS2] soft lockup in rgblk_search [GFS2] soft lockup detected in databuf_lo_before_commit [DLM] fix basts for granted PR waiting CW [DLM] More othercon fixes [DLM] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero [DLM] zero unused parts of sockaddr_storage [DLM] fix NULL ls usage [DLM] Clear othercon pointers when a connection is closed commit 3b993e8bee32d6dfe04df560eda8e1aff6248a22 Merge: ab3c556... b5d0b4b... Author: Linus Torvalds Date: Tue Aug 14 09:52:12 2007 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c-s3c2410: Build fix i2c/menelaus: Build fix i2c-mv64xxx: Reinitialize hw and driver on I2C bus hang i2c-mpc: Don't disable I2C module on stop condition i2c-iop3xx: Set I2C_CLASS_HWMON to adapter class i2c/isp1301_omap: Build fixes, whitespace i2c-mpc: Pass correct dev_id to free_irq on error path i2c-i801: Typo: erroneous commit b5d0b4ba389711183b5af71438fe21b40ee32d6d Author: Ben Dooks Date: Tue Aug 14 18:37:15 2007 +0200 i2c-s3c2410: Build fix Fixup the include files after the arch moves that where included in 2.6.23. Signed-off-by: Ben Dooks Signed-off-by: Jean Delvare commit c1147cc6d18389f6530bae27741b9b2665e862e6 Author: David Brownell Date: Tue Aug 14 18:37:14 2007 +0200 i2c/menelaus: Build fix Fix Menelaus build error, and remove needless "#define DEBUG". Signed-off-by: David Brownell Signed-off-by: Jean Delvare commit a07ad1cc0300931bfd76bfcd2da3ddad743f4a89 Author: Dale Farnsworth Date: Tue Aug 14 18:37:14 2007 +0200 i2c-mv64xxx: Reinitialize hw and driver on I2C bus hang Under certain conditions, the mv64xxx I2C bus can hang preventing further operation. To make the driver more robust, we now reset the I2C hardware and the driver state machine when such hangs are detected. Signed-off-by: Dale Farnsworth Acked-by: Mark A. Greer Signed-off-by: Jean Delvare commit 5af0e07f87e7d9be2a9db514af1e338341240f6d Author: Domen Puncer Date: Tue Aug 14 18:37:14 2007 +0200 i2c-mpc: Don't disable I2C module on stop condition Disabling module on stop doesn't work on some CPUs (ie. mpc8241, as reported by Guennadi Liakhovetski), so remove that. Disable I2C module on errors/interrupts to prevent it from locking up on mpc5200b. Signed-off-by: Domen Puncer Acked-by: Guennadi Liakhovetski Signed-off-by: Jean Delvare commit 432ca994bf7107e88916fd9606ca7402a4571359 Author: Arnaud Patard Date: Tue Aug 14 18:37:14 2007 +0200 i2c-iop3xx: Set I2C_CLASS_HWMON to adapter class In order to be able to use sensors on the IOP3xx SoCs, one needs to set the adapter class to I2C_CLASS_HWMON. Signed-off-by: Arnaud Patard Signed-off-by: Jean Delvare commit 25da383d26a1dcca4f0205769a24e5eac79c6d35 Author: David Brownell Date: Tue Aug 14 18:37:14 2007 +0200 i2c/isp1301_omap: Build fixes, whitespace Build fixes for isp1301_omap driver. I think an earlier version of this must have gotten lost somewhere, or maybe it only went into the Linux-OMAP tree. Also, some whitespace fixes to bring this more into sync with the version of this found in the Linux-OMAP tree. (That version has updates for the OTG controller on the OMAP 1710 which break that functionality on OMAP 161x boards like the H2, so merging all of it is not currently an option.) Signed-off-by: David Brownell Signed-off-by: Jean Delvare commit 322454a65371477bed0eb1d189c50d781ebd7f85 Author: Scott Wood Date: Tue Aug 14 18:37:14 2007 +0200 i2c-mpc: Pass correct dev_id to free_irq on error path Signed-off-by: Scott Wood Signed-off-by: Jean Delvare commit 002cf63191eb8b68b7fed48f014b87c456188acc Author: Jean Delvare Date: Tue Aug 14 18:37:13 2007 +0200 i2c-i801: Typo: erroneous Signed-off-by: Jean Delvare commit ab3c556de19b1888b0830ef066524884d4788131 Merge: c4e7ac5... cae7ca3... Author: Linus Torvalds Date: Tue Aug 14 09:31:19 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: [IPVS]: Use IP_VS_WAIT_WHILE when encessary. [NET]: Share correct feature code between bridging and bonding [ATM] drivers/atm/iphase.c: mostly kmalloc + memset conversion to kzalloc [IRDA] irda-usb.c: mostly kmalloc + memset conversion to k[cz]alloc [WAN] drivers/net/wan/hdlc_fr.c: kmalloc + memset conversion to kzalloc [DCCP]: fix memory leak and clean up style - dccp_feat_empty_confirm() [DCCP]: fix theoretical ccids_{read,write}_lock() race [XFRM]: Clean up duplicate includes in net/xfrm/ [TIPC]: Clean up duplicate includes in net/tipc/ [SUNRPC]: Clean up duplicate includes in net/sunrpc/ [PKT_SCHED]: Clean up duplicate includes in net/sched/ [IPV6]: Clean up duplicate includes in net/ipv6/ [IPV4]: Clean up duplicate includes in net/ipv4/ [ATM]: Clean up duplicate includes in net/atm/ [ATM]: Clean up duplicate includes in drivers/atm/ [IPCONFIG]: ip_auto_config fix [ATM]: fore200e_param_bs_queue() must be __devinit commit c4e7ac5d427a48b91752671523f39a04e63e12ff Merge: c019b19... ce57a02... Author: Linus Torvalds Date: Tue Aug 14 09:30:42 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: e1000: Add device IDs of new 82571 board variants xen-netfront: Avoid deref'ing skbafter it is potentially freed. 3c59x maintainer 3c59x: fix duplex configuration natsemi: fix netdev error acounting ax88796 printk fixes myri10ge: Use the pause counter to avoid a needless device reset via-rhine: disable rx_copybreak on archs that don't allow unaligned DMA access commit d18c4d687dd4625360ee14047d7eb454217719ee Author: Steven Whitehouse Date: Thu Jul 19 16:12:50 2007 +0100 [GFS2] Revert remounting w/o acl option leaves acls enabled This reverts commit 569a7b6c2e8965ff4908003b925757703a3d649c. The code was correct originally. The default setting for ACLs after a remount should be to be the same as before the remount. Signed-off-by: Abhijith Das Signed-off-by: Steven Whitehouse commit b9af7ca6d37d541fb0ed96355fd5c65501cbbda8 Author: Steven Whitehouse Date: Wed Jul 18 11:40:06 2007 +0100 [GFS2] Fix setting of inherit jdata attr Due to a mix up between the jdata attribute and inherit jdata attribute it has not been possible to set the inherit jdata attribute on directories. This is now fixed and the ioctl will report the inherit jdata attribute for directories rather than the jdata attribute as it did previously. This stems from our need to have the one bit in the ioctl attr flags mean two different things according to whether the underlying inode is a directory or not. Signed-off-by: Steven Whitehouse commit a867bb28c1cb49ae86d034d8bd8fe6dbcbb19566 Author: Steven Whitehouse Date: Tue Jul 17 10:29:02 2007 +0100 [GFS2] Fix incorrect error path in prepare_write() The error path in prepare_write() was incorrect in the (very rare) event that the transaction fails to start. The following prevents a NULL pointer dereference, Signed-off-by: Steven Whitehouse commit 6eefaf61f664053c1dd6534a994cab3f8bb07263 Author: Steven Whitehouse Date: Tue Jul 17 10:26:56 2007 +0100 [GFS2] Fix incorrect return code in rgrp.c The following patch fixes a bug where 0 was being used as a return code to indicate "nothing to do" when in fact 0 was a valid block location which might be returned by the function. Signed-off-by: Steven Whitehouse commit 24c7387333c77b602ece7ecd6a85fc94f8f16d8c Author: Bob Peterson Date: Thu Jul 12 16:58:50 2007 -0500 [GFS2] soft lockup in rgblk_search This patch seems to fix the problem described in bugzilla bug 246114. It was written by Steve Whitehouse with some tweaking by me. The code was looping in the relatively new section of code designed to search for and reuse unlinked inodes. In cases where it was finding an appropriate inode to reuse, it was looping around and finding the same block over and over because a "<=" check should have been a "<" when comparing the goal block to the last unlinked block found. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse commit bdcb88562ca90e6cfac13130e147c63aaa4f9e41 Author: Bob Peterson Date: Wed Jul 11 15:55:23 2007 -0500 [GFS2] soft lockup detected in databuf_lo_before_commit This is part 2 of the patch for bug #245832, part 1 of which is already in the git tree. The problem was that sdp->sd_log_num_databuf was not always being protected by the gfs2_log_lock spinlock, but the sd_log_le_databuf (which it is supposed to reflect) was protected. That meant there was a timing window during which gfs2_log_flush called databuf_lo_before_commit and the count didn't match what was really on the linked list in that window. So when it ran out of items on the linked list, it decremented total_dbuf from 0 to -1 and thus never left the "while(total_dbuf)" loop. The solution is to protect the variable sdp->sd_log_num_databuf so that the value will always match the contents of the linked list, and therefore the number will never go negative, and therefore, the loop will be exited properly. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse commit 3650925893469ccb03dbcc6a440c5d363350f591 Author: David Teigland Date: Tue Aug 7 09:44:48 2007 -0500 [DLM] fix basts for granted PR waiting CW Fix a long standing bug where a blocking callback would be missed when there's a granted lock in PR mode and waiting locks in both PR and CW modes (and the PR lock was added to the waiting queue before the CW lock). The logic simply compared the numerical values of the modes to determine if a blocking callback was required, but in the one case of PR and CW, the lower valued CW mode blocks the higher valued PR mode. We just need to add a special check for this PR/CW case in the tests that decide when a blocking callback is needed. Signed-off-by: David Teigland Signed-off-by: Steven Whitehouse commit 9e5f2825a8b721360b291f14f42cd7a25781156b Author: Patrick Caulfield Date: Thu Aug 2 14:58:14 2007 +0100 [DLM] More othercon fixes The last patch to clean out 'othercon' structures only fixed half the problem. The attached addresses the other situations too, and fixes bz#238490 Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse commit 1a2bf2eefb63a267aea7f3f80d6ac59160e20810 Author: Jesper Juhl Date: Thu Jul 19 00:27:43 2007 +0200 [DLM] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero There's a memory leak in fs/dlm/member.c::dlm_add_member(). If "dlm_node_weight(ls->ls_name, nodeid)" returns < 0, then we'll return without freeing the memory allocated to the (at that point yet unused) 'memb'. This patch frees the allocated memory in that case and thus avoids the leak. Signed-off-by: Jesper Juhl Signed-off-by: David Teigland Signed-off-by: Steven Whitehouse commit 01c8cab25863de007fe8c598d0033919ea8ae65e Author: Patrick Caulfield Date: Tue Jul 17 16:53:15 2007 +0100 [DLM] zero unused parts of sockaddr_storage When we build a sockaddr_storage for an IP address, clear the unused parts as they could be used for node comparisons. I have seen this occasionally make sctp connections fail. Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse commit 41684f9547455b395ffd65e5b7961067d20a2872 Author: David Teigland Date: Fri Jul 13 14:49:06 2007 -0500 [DLM] fix NULL ls usage Fix regression in recent patch "[DLM] variable allocation" which attempts to dereference an "ls" struct when it's NULL. Signed-off-by: David Teigland Signed-off-by: Steven Whitehouse commit 25720c2d73058f4f929f16093f60817ed52a285c Author: Patrick Caulfield Date: Wed Jul 11 13:39:43 2007 +0100 [DLM] Clear othercon pointers when a connection is closed This patch clears the othercon pointer and frees the memory when a connnection is closed. This could cause a small memory leak when nodes leave the cluster. Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse commit ce57a02c64052c3f1c62f30a902a937e6c316d88 Author: Auke Kok Date: Thu Aug 9 14:09:34 2007 -0700 e1000: Add device IDs of new 82571 board variants This patch adds support for 2 new board variants: - A Quad port fiber 82571 board - A blade version of the 82571 quad copper board Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit cae7ca3d3de48851e929de9469397749638df779 Author: Heiko Carstens Date: Fri Aug 10 15:50:30 2007 -0700 [IPVS]: Use IP_VS_WAIT_WHILE when encessary. For architectures that don't have a volatile atomic_ts constructs like while (atomic_read(&something)); might result in endless loops since a barrier() is missing which forces the compiler to generate code that actually reads memory contents. Fix this in ipvs by using the IP_VS_WAIT_WHILE macro which resolves to while (expr) { cpu_relax(); } (why isn't this open coded btw?) Signed-off-by: Heiko Carstens Signed-off-by: Simon Horman Signed-off-by: David S. Miller commit 7f353bf29e162459f2f1e2ca25e41011fae65241 Author: Herbert Xu Date: Fri Aug 10 15:47:58 2007 -0700 [NET]: Share correct feature code between bridging and bonding http://bugzilla.kernel.org/show_bug.cgi?id=8797 shows that the bonding driver may produce bogus combinations of the checksum flags and SG/TSO. For example, if you bond devices with NETIF_F_HW_CSUM and NETIF_F_IP_CSUM you'll end up with a bonding device that has neither flag set. If both have TSO then this produces an illegal combination. The bridge device on the other hand has the correct code to deal with this. In fact, the same code can be used for both. So this patch moves that logic into net/core/dev.c and uses it for both bonding and bridging. In the process I've made small adjustments such as only setting GSO_ROBUST if at least one constituent device supports it. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f71417614d63932cf56ed98a0947568d6259d11e Author: Mariusz Kozlowski Date: Fri Aug 10 15:26:18 2007 -0700 [ATM] drivers/atm/iphase.c: mostly kmalloc + memset conversion to kzalloc drivers/atm/iphase.c | 111508 -> 111431 (-77 bytes) drivers/atm/iphase.o | 254740 -> 254260 (-480 bytes) Signed-off-by: Mariusz Kozlowski Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 48e3eeb1a1a89a3ea256cf6d3c898e753787cfaa Author: Mariusz Kozlowski Date: Fri Aug 10 15:25:40 2007 -0700 [IRDA] irda-usb.c: mostly kmalloc + memset conversion to k[cz]alloc drivers/net/irda/irda-usb.c | 59694 -> 59541 (-153 bytes) drivers/net/irda/irda-usb.o | 170588 -> 169256 (-1332 bytes) Signed-off-by: Mariusz Kozlowski Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 1ee325438cdbe374ebea6e3d2f19204072c15038 Author: Mariusz Kozlowski Date: Fri Aug 10 15:24:50 2007 -0700 [WAN] drivers/net/wan/hdlc_fr.c: kmalloc + memset conversion to kzalloc drivers/net/wan/hdlc_fr.c | 31260 -> 31223 (-37 bytes) drivers/net/wan/hdlc_fr.o | 144872 -> 144728 (-144 bytes) Signed-off-by: Mariusz Kozlowski Acked-by: Krzysztof Halasa Signed-off-by: Andrew Morton commit e576de82ee628f68e5a44527c7ee99eadeab2e62 Author: Jesper Juhl Date: Fri Aug 10 15:23:54 2007 -0700 [DCCP]: fix memory leak and clean up style - dccp_feat_empty_confirm() There's a memory leak in net/dccp/feat.c::dccp_feat_empty_confirm(). If we hit the 'default:' case of the 'switch' statement, then we return without freeing 'opt', thus leaking 'struct dccp_opt_pend' bytes. The leak is fixed easily enough by adding a kfree(opt); before the return statement. The patch also changes the layout of the 'switch' to be more in line with CodingStyle. Signed-off-by: Jesper Juhl Acked-by: Ian McDonald Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit d725fdc8027a4cd961f58d92917fbb91b171abfa Author: Oleg Nesterov Date: Fri Aug 10 15:21:17 2007 -0700 [DCCP]: fix theoretical ccids_{read,write}_lock() race Make sure that spin_unlock_wait() is properly ordered wrt atomic_inc(). (akpm: can't we convert this code to use rwlocks?) Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit b5890d8ba47741425fe3c0d753e1b57bc0561b7b Author: Jesper Juhl Date: Fri Aug 10 15:20:21 2007 -0700 [XFRM]: Clean up duplicate includes in net/xfrm/ This patch cleans up duplicate includes in net/xfrm/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 897c77cab0c386103e1c51fe8f3fc7eb5d1eb37f Author: Jesper Juhl Date: Fri Aug 10 15:19:43 2007 -0700 [TIPC]: Clean up duplicate includes in net/tipc/ This patch cleans up duplicate includes in net/tipc/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 08dd2e29468d55f67fa346ede07ddfc58a60536b Author: Jesper Juhl Date: Fri Aug 10 15:19:09 2007 -0700 [SUNRPC]: Clean up duplicate includes in net/sunrpc/ This patch cleans up duplicate includes in net/sunrpc/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 0a26f4cdc207db14a8e7192bac5a7c84d9e2390a Author: Jesper Juhl Date: Fri Aug 10 15:18:31 2007 -0700 [PKT_SCHED]: Clean up duplicate includes in net/sched/ This patch cleans up duplicate includes in net/sched/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 703310e645c639a84e7f4b35d8a508acde9ef360 Author: Jesper Juhl Date: Fri Aug 10 15:17:58 2007 -0700 [IPV6]: Clean up duplicate includes in net/ipv6/ This patch cleans up duplicate includes in net/ipv6/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit f49f9967b263cc88b48d912172afdc621bcb0a3c Author: Jesper Juhl Date: Fri Aug 10 15:17:24 2007 -0700 [IPV4]: Clean up duplicate includes in net/ipv4/ This patch cleans up duplicate includes in net/ipv4/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 6869a35b365c027b7acf50585c5bb34e34d4c41c Author: Jesper Juhl Date: Fri Aug 10 15:16:42 2007 -0700 [ATM]: Clean up duplicate includes in net/atm/ This patch cleans up duplicate includes in net/atm/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit af3502184aee8a0af6da8678e84c3d5bc5cdb83f Author: Jesper Juhl Date: Fri Aug 10 15:15:55 2007 -0700 [ATM]: Clean up duplicate includes in drivers/atm/ This patch cleans up duplicate includes in drivers/atm/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit dcbdc93c6c64daf20622d6deae774d1e740efb8d Author: Joakim Tjernlund Date: Fri Aug 10 15:14:54 2007 -0700 [IPCONFIG]: ip_auto_config fix The following commandline: root=/dev/mtdblock6 rw rootfstype=jffs2 ip=192.168.1.10:::255.255.255.0:localhost.localdomain:eth1:off console=ttyS0,115200 makes ip_auto_config fall back to DHCP and complain "IP-Config: Incomplete network configuration information." depending on if CONFIG_IP_PNP_DHCP is set or not. The only way I can make ip_auto_config accept my IP config is to add an entry for the server IP: ip=192.168.1.10:192.168.1.15::255.255.255.0:localhost.localdomain:eth1:off I think this is a bug since I am not using a NFS root FS. The following patch fixes the above problem. From: Andrew Morton Davem said (in February!): Well, first of all the change in question is not in 2.4.x either. I just checked the current 2.4.x GIT tree and the test is exactly: if (ic_myaddr == INADDR_NONE || #ifdef CONFIG_ROOT_NFS (MAJOR(ROOT_DEV) == UNNAMED_MAJOR && root_server_addr == INADDR_NONE && ic_servaddr == INADDR_NONE) || #endif ic_first_dev->next) { which matches 2.6.x I even checked 2.4.x when it was branched for 2.5.x and the test was the same at the point in time too. Looking at the proposed change a bit it appears that it is probably correct, as it's trying to check that ROOT_DEV is nfs root. But if it is correct then the UNNAMED_MAJOR comparison in the same code block should be removed as it becomes superfluous. I'm happy to apply this patch with that modification made. Signed-off-by: Joakim Tjernlund Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8aee929eda10b2502fd76c0bf2003f89f7992820 Author: Adrian Bunk Date: Fri Aug 10 15:14:18 2007 -0700 [ATM]: fore200e_param_bs_queue() must be __devinit WARNING: drivers/built-in.o(.text+0x6203bb): Section mismatch: reference to .init.text:fore200e_param_bs_queue (between 'fore200e_initialize' and 'fore200e_monitor_putc') Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 10a273a67343e1f317652d69b09a212ee0284b44 Author: Jeremy Fitzhardinge Date: Mon Aug 13 12:54:37 2007 -0700 xen-netfront: Avoid deref'ing skbafter it is potentially freed. xennet_tx_bug_gc can free the skb before we use it, so make sure we don't. Signed-off-by: Keir Fraser Signed-off-by: Jeremy Fitzhardinge Cc: Jeff Garzik Signed-off-by: Jeff Garzik commit a6d89915aa668776494fec8568d46aa6043ff848 Author: Steffen Klassert Date: Fri Aug 10 14:05:27 2007 -0700 3c59x maintainer Add 3c59x maintainer. Signed-off-by: Steffen Klassert Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 373492d0bdc66680ee598fd5a63e1914631b2522 Author: Steffen Klassert Date: Fri Aug 10 14:05:26 2007 -0700 3c59x: fix duplex configuration A special sequence of ifconfig up/down and plug/unplug the cable can break the duplex configuration of the driver. Setting vp->mii.full_duplex = vp->full_duplex in vortex_up should fix this. Addresses Bug 8575 3c59x duplex configuration broken http://bugzilla.kernel.org/show_bug.cgi?id=8575 Cc: Martin Buck Signed-off-by: Steffen Klassert Cc: Natalie Protasevich Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit c76720cf7ba63a3d179b6da8675653c8b01b6c0b Author: Andrew Morton Date: Fri Aug 10 14:05:23 2007 -0700 natsemi: fix netdev error acounting When a detailed netdev error is counted, we also must account for it in the aggregated error count. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=8106 Cc: Tim Hockin Cc: Jeff Garzik Cc: Chongfeng Hu Cc: Natalie Protasevich Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit b4efe22cc987f4cd68ff838556580c0cc8c64cbc Author: Andrew Morton Date: Fri Aug 10 14:05:21 2007 -0700 ax88796 printk fixes drivers/net/ax88796.c: In function `ax_probe': drivers/net/ax88796.c:825: warning: size_t format, different type arg (arg 4) drivers/net/ax88796.c:825: warning: size_t format, different type arg (arg 5) resource_size_t isn't size_t. Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 626fda948839fc2f488f527076b8f42b1b7a4687 Author: Brice Goglin Date: Thu Aug 9 09:02:14 2007 +0200 myri10ge: Use the pause counter to avoid a needless device reset Use the pause counter to avoid a needless device reset, and print a message telling the admin that our link partner is flow controlling us down to 0 pkts/sec. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit b47157f00414f368f2847697ce48b76f1a5e5110 Author: Dustin Marquess Date: Fri Aug 10 14:05:15 2007 -0700 via-rhine: disable rx_copybreak on archs that don't allow unaligned DMA access Patch to disable the rx_copybreak feature on hardware architectures that don't allow unaligned DMA access. #ifdef code taken from tulip_core.c. Problem pointed out by Ivan Kokshaysky. Signed-off-by: Dustin Marquess Cc: Francois Romieu Cc: Ivan Kokshaysky Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit c019b1933015ee31366eeaa085bad3ee9516991c Author: Alexey Starikovskiy Date: Tue Aug 14 01:03:42 2007 -0400 ACPI: EC: Fix "no battery" regression Restore deleted call to register query methods. http://bugzilla.kernel.org/show_bug.cgi?id=8886 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown