commit 80584ff3b99c36ead7e130e453b3a48b18072d18 Merge: 73aba63... 2213217... Author: Linus Torvalds Date: Wed Apr 11 15:44:45 2007 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] mpc52xx_pic: fix main interrupt masking commit 73aba63c5d62f4f504c6469c7c56311a0c818b20 Merge: 29ac8ca... cec34dd... Author: Linus Torvalds Date: Wed Apr 11 15:40:45 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: myri10ge: update driver version to 1.3.0-1.233 myri10ge: more Intel chipsets providing aligned PCIe completions myri10ge: fix management of the firmware 4KB boundary crossing restriction cxgb3 - missing CPL hanler and register setting. cxgb3 - MAC watchdog update cxgb3 - avoid deadlock with mac watchdog skge: fix wake on lan sky2: phy workarounds for Yukon EC-U A1 sky2: turn on clocks when doing resume sky2: turn carrier off when down skge: turn carrier off when down [PATCH] bcm43xx: Fix PPC machine checks and match loopback gain specs [PATCH] bcm43xx: Fix 802.11b/g scan limits to match regulatory reqs [PATCH] zd1211rw: Fix E2P_PHY_REG patching [PATCH] zd1211rw: Reject AL2230S devices commit 29ac8cabd225eaccb2918846f2f2f4e4d99030bd Merge: c48ea60... 2ea547d... Author: Linus Torvalds Date: Wed Apr 11 15:40:03 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: Nikon D80 unusual device patch EHCI: fix remote wakeup regression in 2.6.21-rc commit c48ea60359a303f3faf5991205b0cdb58dfe6eed Author: Dmitry Torokhov Date: Wed Apr 11 01:37:18 2007 -0400 [PATCH] PM: use kobject_name() to access kobject names Noone should use kobj.name directly since it may contain garbage. Objects with longer names have them stored in separately allocated memory pointed to by kobj->k_name. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit 2ea547d2dec97b279ba90c7768960856f2116c79 Author: Emil Larsson Date: Thu Mar 29 22:48:46 2007 -0700 USB: Nikon D80 unusual device patch the Nikon D80 camera will not work without an UNUSUAL_DEV entry embodied in the attached patch (made against 2.6.20.3). Hope you find it helpful, or if not, pass it along to someone who does. From: Emil Larsson Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit 61e8b858abe38c1042135065c59f7d339194b50b Author: Alan Stern Date: Mon Apr 9 11:52:31 2007 -0400 EHCI: fix remote wakeup regression in 2.6.21-rc There is one significant difference between the behavior of root hubs (as embodied in host controller hardware) and external hubs: When a remote-wakeup signal is received, an external hub sends an interrupt message at the _end_ of the resume sequence but a root hub generates and interrupt at the _beginning_ of the resume sequence. The host system must poll for the end of the sequence. When ehci-hcd was converted to interrupt-driven operation instead of using polling, the remaining need for this particular poll was overlooked. This patch (as894) fixes the problem. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 22132178b26c907d19f661a4ae7fd265962d417e Author: Domen Puncer Date: Wed Apr 11 00:27:49 2007 +0200 [POWERPC] mpc52xx_pic: fix main interrupt masking The bit setting was off by one. Tested with RTC and GPIO_WKUP interrupts. Signed-off-by: Domen Puncer Signed-off-by: Sylvain Munaut Signed-off-by: Paul Mackerras commit cec34dda71bd8bb1df61579d6a1440723baec9f7 Merge: 4b2281c... ec759a2... Author: Jeff Garzik Date: Wed Apr 11 11:55:45 2007 -0400 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit 4b2281c7aa6a6e2615b35f8cebd93656dc6d714c Author: Brice Goglin Date: Tue Apr 10 21:22:19 2007 +0200 myri10ge: update driver version to 1.3.0-1.233 Update the myri10ge driver version number to 1.3.0-1.233. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit f19baaeaadf9d77bcc6c122500c70b27c5bbc7a4 Author: Brice Goglin Date: Tue Apr 10 21:21:39 2007 +0200 myri10ge: more Intel chipsets providing aligned PCIe completions Add the Intel 5000 southbridge (aka Intel 6310/6311/6321ESB) PCIe ports and the Intel E30x0 chipsets to the whitelist of aligned PCIe completion. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit ae8509b1876e6e1074edc9846296e80983e30502 Author: Brice Goglin Date: Tue Apr 10 21:21:08 2007 +0200 myri10ge: fix management of the firmware 4KB boundary crossing restriction Simpler way of dealing with the firmware 4KB boundary crossing restriction for rx buffers. This fixes a variety of memory corruption issues when using an "uncommon" MTU with a 16KB page size. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 6cdbd77e8883aac2e24f8b19b91e5b1c839213a0 Author: Divy Le Ray Date: Mon Apr 9 20:10:33 2007 -0700 cxgb3 - missing CPL hanler and register setting. Remove specific CPL handler. Add missing CPL handler. Add missing register setting when the interface is brought up. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit 59cf81076a85e1df273155298c462574b49cc0fe Author: Divy Le Ray Date: Mon Apr 9 20:10:27 2007 -0700 cxgb3 - MAC watchdog update The MAC watchdog was failing if the peer interface was brought down. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit f2d961c9827bab4b64a1b4ea30c68cf5ab2b2330 Author: Divy Le Ray Date: Mon Apr 9 20:10:22 2007 -0700 cxgb3 - avoid deadlock with mac watchdog Fix a deadlock when the interface s configured down and the watchdog tack is sleeping on rtnl_lock. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit 692412b31ffb5df00197ea591dd635fc07506c02 Author: Stephen Hemminger Date: Mon Apr 9 15:32:45 2007 -0700 skge: fix wake on lan Need to rework wake on lan code to setup properly and get activated on shutdown (and suspend), not when ethtool is run. This does not need to go to stable queue because wake on lan was not even included in 2.6.20 (or earlier versions). Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 9467a8fc89844ff2ea9c6d13460dddb3b674cc37 Author: Stephen Hemminger Date: Sat Apr 7 16:02:28 2007 -0700 sky2: phy workarounds for Yukon EC-U A1 The workaround Yukon EC-U wasn't comparing with correct version and wasn't doing correct setup. Without it, 88e8056 throws all sorts of errors. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 1ad5b4a5c224c5f98f9745adbcf99899624c8138 Author: Stephen Hemminger Date: Sat Apr 7 16:02:27 2007 -0700 sky2: turn on clocks when doing resume Some of these chips are disabled until clock is enabled. This fixes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=404107 Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 9a87240c67565578a9533101b930ef4a975be333 Author: Stephen Hemminger Date: Sat Apr 7 16:02:26 2007 -0700 sky2: turn carrier off when down Driver needs to turn off carrier when down. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit e5b9ddd9a0f95e133db7b43d05978f24cd6f1369 Author: Stephen Hemminger Date: Sat Apr 7 16:02:25 2007 -0700 skge: turn carrier off when down Driver needs to turn off carrier when down, otherwise it can confuse bonding and bridging and looks like carrier is on immediately when it is brought back up. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 5ab7ffea520948115a51a9931e1bb4c818aa8e35 Author: David Howells Date: Tue Apr 10 15:10:45 2007 +0100 [PATCH] FRV: Update the FRV arch MAINTAINER record to get a hit on "grep -i frv" Update the FRV arch MAINTAINER record to get a hit on "grep -i frv". Whilst FR-V is technically correct, it's normally thought of as FRV. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit ff78b20235f84966c4b7962ce94e800adecc5383 Author: Cliff Brake Date: Mon Apr 9 23:50:50 2007 -0400 [PATCH] Input: ucb1400 - set up driver's name to show in sysfs The UCB1400 is missing a name parameter in the device_driver struct. This causes missing information in the /sys tree and seems to cause other problems with the AC97 functionality. This was tested on a PXA270 system. Signed-off-by: Cliff Brake Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit 0bce0b7a3b25b33220be77dcaf3dc4585641100c Merge: c3474be... 52ea071... Author: Linus Torvalds Date: Tue Apr 10 17:24:56 2007 -0700 Merge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] intel_agp: fix G965 GTT size detect commit c3474be4ddcae0256a13cbbe35d849c153c4ec4b Merge: 5a92d63... 199c116... Author: Linus Torvalds Date: Tue Apr 10 17:24:36 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: change deprecation status of dv1394 commit 5a92d635bec814fb53595fc80488765bc0d4ff0e Merge: e676853... 6371ea3... Author: Linus Torvalds Date: Tue Apr 10 17:23:52 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IPoIB/cm: Fix DMA direction typo IB/iser: Don't defer connection failure notification to workqueue commit e676853c8c3f77166c03f1eea7dab6e854eeb819 Merge: 8bd51cc... 8da7d1b... Author: Linus Torvalds Date: Tue Apr 10 17:23:36 2007 -0700 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: Do not discard truncated input reports commit 8bd51cce98aa80ff8b56d34a0e48316c5f887818 Merge: 9631eb0... a7a832d... Author: Linus Torvalds Date: Tue Apr 10 17:22:31 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: ide: add "optical" to sysfs "media" attribute ide: ugly messages trying to open CD drive with no media present ide: correctly prevent IDE timer expiry function to run if request was already handled commit 9631eb0bc18bc1fd1cc84e535260d67ed6a36865 Merge: b4dfd6b... 50c9cc2... Author: Linus Torvalds Date: Tue Apr 10 17:22:16 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NETFILTER]: ipt_CLUSTERIP: fix oops in checkentry function [TCP]: slow_start_after_idle should influence cwnd validation too [SC92031]: Fix priv->lock context [NET_SCHED]: cls_tcindex: fix compatibility breakage commit b4dfd6bc35f6c1e0fcbb4268c523b3939955d3af Merge: 90f30ec... 2e0d232... Author: Linus Torvalds Date: Tue Apr 10 17:21:57 2007 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] SGI Altix : fix pcibr_dmamap_ate32() bug [IA64] Fix CPU freq displayed in /proc/cpuinfo [IA64] Fix wrong assumption about irq and vector in msi_ia64.c [IA64] BTE error timer fix commit a7a832de9e9624bcf069a5369c3c38ba2f44d460 Author: Danny Kukawka Date: Tue Apr 10 22:39:14 2007 +0200 ide: add "optical" to sysfs "media" attribute Add "optical" to sysfs "media" attribute as already in /proc Signed-off-by: Danny Kukawka Signed-off-by: Bartlomiej Zolnierkiewicz commit 76ca1af10e28021e1894c5703da42b5e7bff1771 Author: Stuart Hayes Date: Tue Apr 10 22:38:43 2007 +0200 ide: ugly messages trying to open CD drive with no media present I get the following error messages when trying to open a CD device (specifically, the Teac CD-ROM CD-224E) that has no media present: hda: packet command error: status=3D0x51 { DriveReady SeekComplete Error } hda: packet command error: error=3D0x54 { AbortedCommand LastFailedSense=0x05 } ide: failed opcode was: unknown This happens when a "start stop unit" command (0x1b 0 0 0 3 0 0 0 0 0) is sent to the drive to try to close the CD-ROM tray, but this drive doesn't have that capability (it's a slim portable-type CD-ROM), so it reports sense key 5 (illegal request) with asc/ascq 24/0. This is exactly how SFF8090i says it should respond. But ide-cd.c (in cdrom_decode_status() ) just sees sense key 5 and spews out an error. It then goes on to request sense data, and cdrom_log_sense() understands this error and doesn't log it. The patch, for kernel 2.6.20.4, suppresses this error message. Signed-off-by: Stuart Hayes Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit 23450319e2890986c247ec0aa1442f060e657e6d Author: Suleiman Souhlal Date: Tue Apr 10 22:38:37 2007 +0200 ide: correctly prevent IDE timer expiry function to run if request was already handled It is possible for the timer expiry function to run even though the request has already been handled: ide_timer_expiry() only checks that the handler is not NULL, but it is possible that we have handled a request (thus clearing the handler) and then started a new request (thus starting the timer again, and setting a handler). A simple way to exhibit this is to set the DMA timeout to 1 jiffy and run dd: The kernel will panic after a few minutes because ide_timer_expiry() tries to add a timer when it's already active. To fix this, we simply add a request generation count that gets incremented at every interrupt, and check in ide_timer_expiry() that we have not already handled a new interrupt before running the expiry function. Signed-off-by: Suleiman Souhlal Signed-off-by: Bartlomiej Zolnierkiewicz commit 50c9cc2e540aeaab78ab548a8d42568977c6844f Author: Jaroslav Kysela Date: Tue Apr 10 13:26:48 2007 -0700 [NETFILTER]: ipt_CLUSTERIP: fix oops in checkentry function The clusterip_config_find_get() already increases entries reference counter, so there is no reason to do it twice in checkentry() callback. This causes the config to be freed before it is removed from the list, resulting in a crash when adding the next rule. Signed-off-by: Jaroslav Kysela Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ec759a2b383b50950be37fbe470c4cc2ca18e2ce Author: Larry Finger Date: Sat Apr 7 14:11:03 2007 -0500 [PATCH] bcm43xx: Fix PPC machine checks and match loopback gain specs The specifications for loopback_gain calculation and for G PHY initialization have been updated. This patch implements them and fixes a machine check error that occurs for PPC architecture with a phy->rev of 1. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 81e880064dd32b3efdc41ad4cc2416c4744693ee Author: Larry Finger Date: Sat Apr 7 13:54:35 2007 -0500 [PATCH] bcm43xx: Fix 802.11b/g scan limits to match regulatory reqs In 802.11b/g mode, bcm43xx actively scans channels 1-14 no matter what locale has been set, either in the sprom or by the locale option. This behaviorviolates regulatory rules everywhere in the world except Japan. This patch changes the default range to the correct value if the locale has been set, and to channels 1-13 if no locale has been set. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 92b3e2e9253a9f4c9224071842fd263c334dece0 Author: Daniel Drake Date: Tue Apr 3 23:17:37 2007 +0100 [PATCH] zd1211rw: Fix E2P_PHY_REG patching Due to conflicting/confusing defines in the vendor driver, we were reading E2P_PHY_REG from the wrong location. CR157 patching was slightly incorrect in that the vendor driver only patches in an 8-bit value, whereas we were patching 24 bits. Additionally, CR157 patching was happening on both zd1211 and zd1211b, but this should only happen on zd1211. Signed-off-by: Daniel Drake Signed-off-by: Ulrich Kunitz Signed-off-by: John W. Linville commit 6371ea3d48e17d4638a91a4a1e0364e56204e418 Author: Michael S. Tsirkin Date: Tue Apr 10 18:32:42 2007 +0300 IPoIB/cm: Fix DMA direction typo Receive buffers need to be mapped with DMA_FROM_DEVICE. Incorrectly mapping with DMA_TO_DEVICE causes a hard lock on ppc64 machines with an IOMMU. This fixes Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit ae6ead4623bfbc57f3945ff86f27e51811e2e91b Author: Daniel Drake Date: Sun Mar 11 19:54:11 2007 +0000 [PATCH] zd1211rw: Reject AL2230S devices zd1211rw currently detects AL2230S-based devices as AL2230, and hence programs the RF incorrectly. Transmit silently fails on this misconfiguration. After this patch, AL2230S devices are rejected with an error message, to avoid any confusion with an apparent driver bug. Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit 52ea0718ea506df0915eacedb439e65c5f214e0e Author: Wang Zhenyu Date: Tue Apr 10 09:42:48 2007 +0800 [AGPGART] intel_agp: fix G965 GTT size detect On G965, I810_PGETBL_CTL is a mmio offset, but we wrongly take it as pci config space offset in detecting GTT size. This one line patch fixs this. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit 15d33c070ddde99f7368e6b17b71d22c866f97d9 Author: David S. Miller Date: Mon Apr 9 13:23:14 2007 -0700 [TCP]: slow_start_after_idle should influence cwnd validation too For the cases that slow_start_after_idle are meant to deal with, it is almost a certainty that the congestion window tests will think the connection is application limited and we'll thus decrease the cwnd there too. This defeats the whole point of setting slow_start_after_idle to zero. So test it there too. We do not cancel out the entire tcp_cwnd_validate() function so that if the sysctl is changed we still have the validation state maintained. Signed-off-by: David S. Miller commit 699784b7614ce61b16a075445b8e5b6c379c5086 Author: Herbert Xu Date: Mon Apr 9 11:51:15 2007 -0700 [SC92031]: Fix priv->lock context The spin_lock calls made in dev->open and dev->close must disable BH since open/close are made in process context. Conversely, the call in dev->hard_start_xmit does not need to disable BH since it is already executing with BH disabled. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit bb8a954f27ed8fb8f57e80e6b63d837cfdcad689 Author: Patrick McHardy Date: Mon Apr 9 11:42:25 2007 -0700 [NET_SCHED]: cls_tcindex: fix compatibility breakage Userspace uses an integer for TCA_TCINDEX_SHIFT, the kernel was changed to expect and use a u16 value in 2.6.11, which broke compatibility on big endian machines. Change back to use int. Reported by Ole Reinartz Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 90f30eccf41302a2542f5d374af243061902bd98 Merge: c2481cc... 4598af3... Author: Linus Torvalds Date: Mon Apr 9 11:45:18 2007 -0700 Merge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] intel_agp: PCI id update for Intel 965GM commit 199c1167f5e8123a9b0a9ab1e8b78a6aa4b2733f Author: Stefan Richter Date: Thu Mar 22 00:40:06 2007 +0100 ieee1394: change deprecation status of dv1394 Nobody ported ffmpeg from dv1394 to rawiso yet, and there is no justification to remove dv1394 right now. Nevertheless, a strong deprecation of this ABI makes a lot of sense, especially as Kristian H's drivers shape up to be an attractive alternative to the existing ones. But we don't have a schedule at the moment. Signed-off-by: Stefan Richter commit c2481cc4a8727141474472cb1301fce989ce0865 Author: Andrew Morton Date: Sun Apr 8 16:04:04 2007 -0700 [PATCH] i386: irqbalance_disable() section fix WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text:irqbalance_disable from .text between 'quirk_intel_irqbalance' (at offset 0x80a5) and 'i8237A_suspend' Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c993c7355df55283bc9a539652be44cd81b8c6dd Author: Andrew Morton Date: Sun Apr 8 16:04:03 2007 -0700 [PATCH] x86_64 early quirks: fix early_qrk[] section tag WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.text:nvidia_bugs from .data between 'early_qrk' (at offset 0x8428) and 'enable_cpu_hotplug' WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.text:via_bugs from .data between 'early_qrk' (at offset 0x8438) and 'enable_cpu_hotplug' WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.text:ati_bugs from .data between 'early_qrk' (at offset 0x8448) and 'enable_cpu_hotplug' The compiler is putting it into .data because the __initdata is in the wrong place. Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6d2cccb55b518956a7de75182757276a2057869 Author: David Brownell Date: Sun Apr 8 16:04:02 2007 -0700 [PATCH] omap_cf: oops-on-suspend fix Convert omap_cf into a platform_driver ... this resolves oopsing during suspend/resume. Evidently folk haven't tried suspend/resume on an OSK (the main platform for this driver) since September or so, which is when platform_device learned about suspend_late()/resume_early() and stopped being able to suspend/resume without a platform_driver. Signed-off-by: David Brownell Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49f19710512c825aaea73b9207b3a848027cda1d Author: Zachary Amsden Date: Sun Apr 8 16:04:01 2007 -0700 [PATCH] Proper fix for highmem kmap_atomic functions for VMI for 2.6.21 Since lazy MMU batching mode still allows interrupts to enter, it is possible for interrupt handlers to try to use kmap_atomic, which fails when lazy mode is active, since the PTE update to highmem will be delayed. The best workaround is to issue an explicit flush in kmap_atomic_functions case; this is the only way nested PTE updates can happen in the interrupt handler. Thanks to Jeremy Fitzhardinge for noting the bug and suggestions on a fix. This patch gets reverted again when we start 2.6.22 and the bug gets fixed differently. Signed-off-by: Zachary Amsden Cc: Andi Kleen Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5bfffac645a7b2d8119f8bbae34df5c94832799 Author: Timo Savola Date: Sun Apr 8 16:04:00 2007 -0700 [PATCH] fuse: validate rootmode mount option If rootmode isn't valid, we hit the BUG() in fuse_init_inode. Now EINVAL is returned. Signed-off-by: Timo Savola Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4598af33d9143942f00cf7692b247027aba35316 Author: Wang Zhenyu Date: Mon Apr 9 08:51:36 2007 +0800 [AGPGART] intel_agp: PCI id update for Intel 965GM Update PCI id info for Intel 965GM chipset. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit d354d2f4a6fc1b722c2e464a8b3cfd2f6afb304b Author: Linus Torvalds Date: Sat Apr 7 10:18:33 2007 -0700 sched.c: Remove unused variable 'relative' Getting rid of the p->children printout in show_task() left behind an unused variable. Signed-off-by: Linus Torvalds commit 35f6f753b79705bc4b62da5dcc218d75ffa88370 Author: Ingo Molnar Date: Fri Apr 6 21:18:06 2007 +0200 [PATCH] sched: get rid of p->children use in show_task() the p->parent PID printout gives us all the information about the task tree that we need - the eldest_child()/older_sibling()/ younger_sibling() printouts are mostly historic and i do not remember ever having used those fields. (IMO in fact they confuse the SysRq-T output.) So remove them. This code has sentimental value though, those fields and printouts are one of the oldest ones still surviving from Linux v0.95's kernel/sched.c: if (p->p_ysptr || p->p_osptr) printk(" Younger sib=%d, older sib=%d\n\r", p->p_ysptr ? p->p_ysptr->pid : -1, p->p_osptr ? p->p_osptr->pid : -1); else printk("\n\r"); written 15 years ago, in early 1992. Signed-off-by: Ingo Molnar Signed-off-by: Linus 'snif' Torvalds commit 7f30e49ee1c2c1e95ce9d2ccce5221ddb793dd60 Author: Tejun Heo Date: Sat Apr 7 14:59:41 2007 +0900 [PATCH] irq-devres: fix failure path of devm_request_irq() devres should be deallocated with devres_free() not kfree(). This bug corrupts slab on IRQ request failure. Fix it. Signed-off-by: Tejun Heo Cc: Andrew Morton Cc: Greg KH Signed-off-by: Linus Torvalds commit 995f054f2a342f8505fed4f8395d12c0f5966414 Author: Ingo Molnar Date: Sat Apr 7 12:05:00 2007 +0200 [PATCH] high-res timers: resume fix Soeren Sonnenburg reported that upon resume he is getting this backtrace: [] smp_apic_timer_interrupt+0x57/0x90 [] retrigger_next_event+0x0/0xb0 [] apic_timer_interrupt+0x28/0x30 [] retrigger_next_event+0x0/0xb0 [] __kfifo_put+0x8/0x90 [] on_each_cpu+0x35/0x60 [] clock_was_set+0x18/0x20 [] timekeeping_resume+0x7c/0xa0 [] __sysdev_resume+0x11/0x80 [] sysdev_resume+0x47/0x80 [] device_power_up+0x5/0x10 it turns out that on resume we mistakenly re-enable interrupts too early. Do the timer retrigger only on the current CPU. Signed-off-by: Ingo Molnar Acked-by: Thomas Gleixner Acked-by: Soeren Sonnenburg Signed-off-by: Linus Torvalds commit bbef618190fb484b28b7d441e6fc5d524027c4fa Merge: a21bd69... b8fa2f3... Author: Linus Torvalds Date: Fri Apr 6 18:15:30 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TG3]: Fix crash during tg3_init_one(). [IPV6]: Revert recent change to rt6_check_dev(). [XFRM]: beet: fix IP option decapsulation [XFRM]: beet: fix beet mode decapsulation [XFRM]: beet: use IPOPT_NOP for option padding [XFRM]: beet: fix IP option encapsulation commit b8fa2f3a82069304acac1f9e957d491585f4f49a Author: Michael Chan Date: Fri Apr 6 17:35:37 2007 -0700 [TG3]: Fix crash during tg3_init_one(). The driver will crash when the chip has been initialized by EFI before tg3_init_one(). In this case, the driver will call tg3_chip_reset() before allocating consistent memory. The bug is fixed by checking for tp->hw_status before accessing it during tg3_chip_reset(). Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 2e0d232bff31973f58c33412b45fce51b6770698 Author: Mike Habeck Date: Fri Apr 6 12:04:39 2007 -0500 [IA64] SGI Altix : fix pcibr_dmamap_ate32() bug On a SGI Altix TIOCP based PCI bus we need to include the ATE_PIO attribute bit if we're mapping a 32bit MSI address. Signed-off-by: Mike Habeck Signed-off-by: Tony Luck commit 8a3a78d1498c4c13c3ec235a4b6338624b6ef68d Author: Venki Pallipadi Date: Fri Apr 6 10:04:49 2007 -0700 [IA64] Fix CPU freq displayed in /proc/cpuinfo My patch: git commit=95235ca2c20ac0b31a8eb39e2d599bcc3e9c9a10 introduced a bug in IA64 cpuinfo output. Patch changed the proc_freq from 1HZ resolution to 1KHz resolution, but left format string unchanged at " %lu.%06lu". Below is the fix. Thanks to Bjorn for catching this. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Tony Luck commit 9438a1218eceb1b3891d242da01bc3cc82cb7342 Author: Ishimatsu Yasuaki Date: Fri Apr 6 16:51:12 2007 +0900 [IA64] Fix wrong assumption about irq and vector in msi_ia64.c This patch fixes a wrong assumption in ia64 MSI code that IRQ equals vector. Signed-off-by: Kenji Kaneshige Signed-off-by: Yasuaki Ishimatsu Signed-off-by: Tony Luck commit fbff71e1ec1c4695d51d496a53228ecdcb6361eb Author: Russ Anderson Date: Fri Mar 30 17:13:18 2007 -0500 [IA64] BTE error timer fix The bte recovery_timer was not being set correctly. Signed-off-by: Russ Anderson Signed-off-by: Tony Luck commit 161980f4c6b846625efe6227420175cb41477de3 Author: David S. Miller Date: Fri Apr 6 11:42:27 2007 -0700 [IPV6]: Revert recent change to rt6_check_dev(). This reverts a0d78ebf3a0e33a1aeacf2fc518ad9273d6a1c2f It causes pings to link-local addresses to fail. Signed-off-by: David S. Miller commit 254d0d24e31c3df64ccfff349c9aa9d1e5989819 Author: Patrick McHardy Date: Thu Apr 5 16:03:33 2007 -0700 [XFRM]: beet: fix IP option decapsulation Beet mode looks for the beet pseudo header after the outer IP header, which is wrong since that is followed by the ESP header. Additionally it needs to adjust the packet length after removing the pseudo header and point the data pointer to the real data location. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d4b1e840629562953d81c9fe0a3a67473f3d993c Author: Patrick McHardy Date: Thu Apr 5 15:59:41 2007 -0700 [XFRM]: beet: fix beet mode decapsulation Beet mode decapsulation fails to properly set up the skb pointers, which only works by accident in combination with CONFIG_NETFILTER, since in that case the skb is fixed up in xfrm4_input before passing it to the netfilter hooks. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 04fef9893a1fa5d429522e09bc9591736408f2e8 Author: Patrick McHardy Date: Thu Apr 5 15:54:39 2007 -0700 [XFRM]: beet: use IPOPT_NOP for option padding draft-nikander-esp-beet-mode-07.txt states "The padding MUST be filled with NOP options as defined in Internet Protocol [1] section 3.1 Internet header format.", so do that. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c5027c9a896fbe05367fb893a274deca5114bfd0 Author: Patrick McHardy Date: Thu Apr 5 15:54:02 2007 -0700 [XFRM]: beet: fix IP option encapsulation Beet mode calculates an incorrect value for the transport header location when IP options are present, resulting in encapsulation errors. The correct location is 4 or 8 bytes before the end of the original IP header, depending on whether the pseudo header is padded. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 1d426d6418d1914b592c9c307c02e488d9182fa8 Author: Erez Zilber Date: Sun Apr 1 12:53:43 2007 +0200 IB/iser: Don't defer connection failure notification to workqueue When a connection is terminated asynchronously from the iSCSI layer's perspective, iSER needs to notify the iSCSI layer that the connection has failed. This is done using a workqueue (switched to from the iSER tasklet context). Meanwhile, the connection object (that holds the work struct) is released. If the workqueue function wasn't called yet, it will be called later with a NULL pointer, which will crash the kernel. The context switch (tasklet to workqueue) is not required, and everything can be done from the iSER tasklet. This eliminates the NULL work struct bug (and simplifies the code). Signed-off-by: Erez Zilber Signed-off-by: Roland Dreier commit 8da7d1bae512aee155ef02f7ab1266358842e1fd Author: Adam Kropelin Date: Thu Apr 5 16:06:30 2007 +0200 HID: Do not discard truncated input reports Truncated reports should not be discarded since it prevents buggy devices from communicating with userspace. Prior to the regession introduced in 2.6.20, a shorter-than-expected report in hid_input_report() was passed thru after having the missing bytes cleared. This behavior was established over a few patches in the 2.6.early-teens days, including commit cd6104572bca9e4afe0dcdb8ecd65ef90b01297b. This patch restores the previous behavior and fixes the regression. Signed-off-by: Adam Kropelin Signed-off-by: Jiri Kosina