commit 8b2d1833a29e9dc8bccad348396ad08666379d77 Merge: c9daa27... ba596a0... Author: Linus Torvalds Date: Fri Jan 18 14:06:44 2008 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (31 commits) Replace cpmac fix dl2k: the rest dl2k: MSCR, MSSR, ESR, PHY_SCR fixes dl2k: BMSR fixes dl2k: ANAR, ANLPAR fixes dl2k: BMCR_t fixes 3c574, 3c515 bitfields abuse sbni endian fixes wan/lmc bitfields fixes dscc4 endian fixes S2io: Fixed synchronization between scheduling of napi with card reset and close atl1: fix frame length bug Documentation: add a guideline for hard_start_xmit method Revert "sky2: remove check for PCI wakeup setting from BIOS" e1000e Kconfig: remove ref to nonexistant docs bonding: Don't hold lock when calling rtnl_unlock bonding: fix lock ordering for rtnl and bonding_rwsem bonding: Fix up parameter parsing bonding: release slaves when master removed via sysfs bonding: fix locking during alb failover and slave removal ... commit c9daa2722a3f1967e3e9750fd4cb6a7352a3cd63 Merge: 977c8fa... 0d710cb... Author: Linus Torvalds Date: Fri Jan 18 14:06:19 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] clarify watchdog operation in documentation [WATCHDOG] Revert "Stop looking for device as soon as one is found" commit 977c8fa4d75d4ebe7ebbe116eed9e06f780fb34d Merge: 84f7466... e107ebe... Author: Linus Torvalds Date: Fri Jan 18 14:06:08 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: add support for the latest Intel processors to Oprofile commit 84f7466ee20cc094aa38617abfa2f3834871f054 Author: Rusty Russell Date: Sat Jan 19 07:02:29 2008 +1100 Selecting LGUEST should turn on Guest support, as in 2.6.23. There's currently no way to turn on Lguest guest support; the planned Kconfig virtualization reorg didn't get into 2.6.25. This was unnoticed because if you already had CONFIG_LGUEST_GUEST=y in your config, it worked. Too bad about new users... Also, the Kconfig help was wrong now the virtio drivers are merged. Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit e107ebe0e4a11b821d76ad2c3010c6a6244bd930 Author: Arjan van de Ven Date: Fri Jan 18 22:49:33 2008 +0100 x86: add support for the latest Intel processors to Oprofile The latest Intel processors (the 45nm ones) have a model number of 23 (old ones had 15); they're otherwise compatible on the oprofile side. This patch adds the new model number to the oprofile code. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 0d710cba3afde2109030254ee90654fbb580e8af Author: Andrew Dyer Date: Tue Jan 8 14:40:37 2008 -0600 [WATCHDOG] clarify watchdog operation in documentation It was not clear what the difference is/was between the nowayout feature and the Magic Close feature. Signed-off-by: "Andrew Dyer" Signed-off-by: Wim Van Sebroeck commit cde10ba3ba439592d1bc094102ebfccdeee80cf9 Author: Wim Van Sebroeck Date: Fri Jan 18 21:01:34 2008 +0000 [WATCHDOG] Revert "Stop looking for device as soon as one is found" This reverts commit 3ff6eb4a2fe5757cbe7c5d57c8eb60ab0775f2f0. the !found check in the for loop allready made sure that only one device was found. Signed-Off-By: Pádraig Brady Signed-Off-By: Wim Van Sebroeck commit ba596a01886b236c8171fc28d53842da0128224e Author: Matteo Croce Date: Sat Jan 12 19:05:23 2008 +0100 Replace cpmac fix Please apply this patch since i reverted by mistake the commit 4e3ab47a547616e583c7a5458beced6aa34c8ef3 in 6cd043d99dcf5d252fcc682958541f449113f7b3 Signed-off-by: Matteo Croce Signed-off-by: Jeff Garzik commit 0ca5f319f4bef00d31a21614345ecd5ea0ca8afd Author: Al Viro Date: Sun Jan 13 14:18:25 2008 +0000 dl2k: the rest remove an unused union-with-bitfield of the same sort, add missing conversions in debugging printk Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 5b5119167b724f4c4d54e69f91f22a83b01207af Author: Al Viro Date: Sun Jan 13 14:18:15 2008 +0000 dl2k: MSCR, MSSR, ESR, PHY_SCR fixes Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 96d768517eef3c10d4a82bd121caa42f584082cb Author: Al Viro Date: Sun Jan 13 14:18:05 2008 +0000 dl2k: BMSR fixes Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 21b645e4c2531631992dc127cf676631a70046c8 Author: Al Viro Date: Sun Jan 13 14:17:55 2008 +0000 dl2k: ANAR, ANLPAR fixes same story, different registers... Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit d50956af74859b4e9ba544a0211a94bc2621c1d9 Author: Al Viro Date: Sun Jan 13 14:17:45 2008 +0000 dl2k: BMCR_t fixes broken use of bitfields; FUBAR on big-endian (and not valid C, strictly speaking). Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit b665982409fd5e4d3f1b71591d2f6badf9d2ee99 Author: Al Viro Date: Sun Jan 13 14:17:35 2008 +0000 3c574, 3c515 bitfields abuse wn3_config is shared by these cards; the way we deal with it is both bad C (union abuse) and broken on big-endian. For 3c515 it's less serious (ISA cards are quite rare outside of little-endian boxen), but 3c574 is a pcmcia one and that'd better be endian-independent... Fix is the same in both cases. Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit c15561f0e5615607e2b5524c4b3af64d20cd6e28 Author: Al Viro Date: Sun Jan 13 14:17:25 2008 +0000 sbni endian fixes Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 44b1e77a0275975f3bd8bdeba6c5524105216d6d Author: Al Viro Date: Sun Jan 13 14:17:15 2008 +0000 wan/lmc bitfields fixes Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 409cd63e6ef6a1aa05baa5bbff5521d62acd246d Author: Al Viro Date: Sun Jan 13 14:17:05 2008 +0000 dscc4 endian fixes Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 5f490c9680561e31bf0003693f20e0c7333bbeff Author: Sreenivasa Honnur Date: Mon Jan 14 20:23:04 2008 -0500 S2io: Fixed synchronization between scheduling of napi with card reset and close - Fixed synchronization between scheduling of napi with card reset and close by moving the enabling and disabling of napi to card up and card down functions respectively instead of open and close. Signed-off-by: Surjit Reang Signed-off-by: Ramkrishna Vepa Signed-off-by: Jeff Garzik commit 2a49128f0a6edee337174ea341c1d6d7565be350 Author: Jay Cliburn Date: Mon Jan 14 19:56:41 2008 -0600 atl1: fix frame length bug The driver sets up the hardware to accept a frame with max length equal to MTU + Ethernet header + FCS + VLAN tag, but we neglect to add the VLAN tag size to the ingress buffer. When a VLAN-tagged frame arrives, the hardware passes it, but bad things happen because the buffer is too small. This patch fixes that. Thanks to David Harris for reporting the bug and testing the fix. Tested-by: David Harris Signed-off-by: Jay Cliburn Signed-off-by: Jeff Garzik commit ce3ba1399d2ba81b3699a82649df0cd8223c6662 Author: Matti Linnanvuori Date: Tue Jan 15 06:25:27 2008 -0800 Documentation: add a guideline for hard_start_xmit method Add a guideline not to modify SKBs. Signed-off-by: Matti Linnanvuori Signed-off-by: Jeff Garzik commit be63a21c9573fbf88106ff0f030da5974551257b Author: Stephen Hemminger Date: Tue Jan 15 11:29:29 2008 -0800 Revert "sky2: remove check for PCI wakeup setting from BIOS" This reverts commit 84cd2dfb04d23a961c5f537baa243fa54d0987ac. Some BIOS's break if Wake On Lan is enabled, and the machine can't boot. Better to have some user's have to call ethtool to enable WOL than to break a single user's boot. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 9559cc239d6cf50bf64de0bd7662103238e84274 Merge: e236ed2... d101f64... Author: Jeff Garzik Date: Fri Jan 18 14:40:47 2008 -0500 Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit e236ed23f81430dc020304e2efbc0cfcdf47d9a7 Author: Jason Uhlenkott Date: Wed Jan 16 23:03:17 2008 -0800 e1000e Kconfig: remove ref to nonexistant docs There is no Documentation/networking/e1000e.txt. Signed-off-by: Jason Uhlenkott Cc: Auke Kok Signed-off-by: Jeff Garzik commit 220df5c3defc33cc3cacc0db7487eba801023977 Merge: 5655662... 47cccd7... Author: Jeff Garzik Date: Fri Jan 18 14:39:26 2008 -0500 Merge branch 'ipg-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream-fixes commit 5655662dab4ef044be7efd155f2f5fef2e486545 Author: Jay Vosburgh Date: Thu Jan 17 16:25:03 2008 -0800 bonding: Don't hold lock when calling rtnl_unlock Change bond_mii_monitor to not hold any locks when calling rtnl_unlock, as rtnl_unlock can sleep (when acquring another mutex in netdev_run_todo). Bug reported by Makito SHIOKAWA , who included a different patch. Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 027ea0416c955778ceca7ef82e48a1dd6b4617c9 Author: Jay Vosburgh Date: Thu Jan 17 16:25:02 2008 -0800 bonding: fix lock ordering for rtnl and bonding_rwsem Fix the handling of rtnl and the bonding_rwsem to always be acquired in a consistent order (rtnl, then bonding_rwsem). The existing code sometimes acquired them in this order, and sometimes in the opposite order, which opens a window for deadlock between ifenslave and sysfs. Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit ece95f7fefe3afae19e641e1b3f5e64b00d5b948 Author: Jay Vosburgh Date: Thu Jan 17 16:25:01 2008 -0800 bonding: Fix up parameter parsing A recent change to add an additional hash policy modified bond_parse_parm, but it now does not correctly match parameters passed in via sysfs. Rewrote bond_parse_parm to handle (a) parameter matches that are substrings of one another and (b) user input with whitespace (e.g., sysfs input often has a trailing newline). Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 3b96c858fcb27120fcba222366180c3293393ccf Author: Jay Vosburgh Date: Thu Jan 17 16:25:00 2008 -0800 bonding: release slaves when master removed via sysfs Add a call to bond_release_all in the bonding netdev event handler for the master. This releases the slaves for the case of, e.g., "echo -bond0 > /sys/class/net/bonding_masters", which otherwise will spin forever waiting for references to be released. Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 2543331d367c9fe54f4ba73300894bc21e0a08f4 Author: Jay Vosburgh Date: Thu Jan 17 16:24:59 2008 -0800 bonding: fix locking during alb failover and slave removal alb_fasten_mac_swap (actually rlb_teach_disabled_mac_on_primary) requries RTNL and no other locks. This could cause dev_set_promiscuity and/or dev_set_mac_address to be called with improper locking. Changed callers to hold only RTNL during calls to alb_fasten_mac_swap or functions calling it. Updated header comments in affected functions to reflect proper reality of locking requirements. Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit e0138a66e18c6755ee29ce13b3f1142af775dc5f Author: Jay Vosburgh Date: Thu Jan 17 16:24:58 2008 -0800 bonding: fix ASSERT_RTNL that produces spurious warnings Move an ASSERT_RTNL down to where we should hold only RTNL; the existing check produces spurious warnings because we hold additional locks at _bh, tripping a debug warning in spin_lock_mutex(). Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit e934dd7862e7f613b2ce9730d548a0a70913c8f7 Author: Jay Vosburgh Date: Thu Jan 17 16:24:57 2008 -0800 bonding: fix locking in sysfs primary/active selection Fix the functions that store the primary and active slave options via sysfs to hold the correct locks in the correct order. The bond_change_active_slave and bond_select_active_slave functions both require rtnl, bond->lock for read and curr_slave_lock for write_bh, and no other locks. This is so that the lower level mode-specific functions (notably for balance-alb mode) can release locks down to just rtnl in order to call, e.g., dev_set_mac_address with the locks it expects (rtnl only). Signed-off-by: Jay Vosburgh Signed-off-by: Andy Gospodarek Signed-off-by: Jeff Garzik commit 03bbe082cffc4533f6557bf23f0c672307067246 Merge: 3047290... fb49161... Author: Linus Torvalds Date: Thu Jan 17 15:50:19 2008 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: ALPS - fix sync loss on Acer Aspire 5720ZG Input: psmouse - fix input_dev leak in lifebook driver Input: psmouse - fix potential memory leak in psmouse_connect() Input: usbtouchscreen - fix buffer overflow, make more egalax work Input: mousedev - handle mice that use absolute coordinates commit 30472908d50cf726a68c2b444127a1dafae8a91c Merge: abde3df... e415e6e... Author: Linus Torvalds Date: Thu Jan 17 15:49:59 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [NIU]: Fix 1G PHY link state handling. [NET]: Fix TX timeout regression in Intel drivers. commit abde3dff2496d9d44a218cf8e2a17c2383f20b22 Merge: a3c53e2... 6320bce... Author: Linus Torvalds Date: Thu Jan 17 15:49:49 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix hypervisor TLB operation error reporting. commit a3c53e2310192e63e49610ffcb6a36b2a706fa3e Author: Daniel Walker Date: Thu Jan 17 12:52:05 2008 -0800 fix wrong sized spinlock flags argument Correct wrong sized spinlock flags, form int to unsigned long. Signed-off-by: Daniel Walker Signed-off-by: Linus Torvalds commit 784680336b616dcc4c17cbd25add3b49c555cdeb Author: Nigel Cunningham Date: Thu Jan 17 15:21:21 2008 -0800 Fix unbalanced helper_lock in kernel/kmod.c call_usermodehelper_exec() has an exit path that can leave the helper_lock() call at the top of the routine unbalanced. The attached patch fixes this issue. Signed-off-by: Nigel Cunningham Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34aebfd3bdc93c0c5614f1f61e43b6ddc4be52ae Author: Li Zefan Date: Thu Jan 17 15:21:20 2008 -0800 Revert "local_t Documentation update" This reverts commit e1265205c0ee3919c3f2c750662630154c8faab2. It's a duplicate commit of commit 74beb9db77930be476b267ec8518a642f39a04bf, resulting in a duplicate section. Signed-off-by: Li Zefan Acked-by: Mathieu Desnoyers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 545c4423335469de06af7f7c95e97c1122c1c818 Author: Alex Date: Thu Jan 17 15:21:18 2008 -0800 fix radeonfb regression with Xpress 200m 5955 Fix http://bugzilla.kernel.org/show_bug.cgi?id=9762 Framebuffer is ok only with default parameters only (it is 1280x800-8@60). If parameters are video=radeonfb:1280x800-32@60 then xres, yres and xres_virtual are ok but yres_virtual is 1024. It can be corrected by fbset utility so I think it can be corrected in the driver code also. Steps to reproduce: video=radeonfb:1280x800-32@60 or video=radeonfb:1280x800-16@60 Add 1280x800 mode into modedb Cc: "Rafael J. Wysocki" Cc: "Antonino A. Daplas" Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9723198c219f3546982cb469e5aed26e68399055 Author: Carsten Otte Date: Thu Jan 17 15:21:17 2008 -0800 #ifdef very expensive debug check in page fault path This patch puts #ifdef CONFIG_DEBUG_VM around a check in vm_normal_page that verifies that a pfn is valid. This patch increases performance of the page fault microbenchmark in lmbench by 13% and overall dbench performance by 7% on s390x. pfn_valid() is an expensive operation on s390 that needs a high double digit amount of CPU cycles. Nick Piggin suggested that pfn_valid() involves an array lookup on systems with sparsemem, and therefore is an expensive operation there too. The check looks like a clear debug thing to me, it should never trigger on regular kernels. And if a pte is created for an invalid pfn, we'll find out once the memory gets accessed later on anyway. Please consider inclusion of this patch into mm. Signed-off-by: Carsten Otte Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b2d2cec1081a979e0efd6a1e9559e5a01a3c10e Author: Ivan Kokshaysky Date: Thu Jan 17 15:21:13 2008 -0800 alpha: fix conversion from denormal float to double The trap handler does properly update the fraction, but not the exponent... Thanks to Paolo Bonzini for the bug report and the testcase. Signed-off-by: Ivan Kokshaysky Cc: Paolo Bonzini Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f63dcda197bd71c6565c2121bf70e3d371539f90 Author: Jonas Bonn Date: Thu Jan 17 15:21:13 2008 -0800 jbd: do not try lock_acquire after handle made invalid This likely fixes the oops in __lock_acquire reported as: http://www.kerneloops.org/raw.php?rawid=2753&msgid= http://www.kerneloops.org/raw.php?rawid=2749&msgid= In these reported oopses, start_this_handle is returning -EROFS. Signed-off-by: Jonas Bonn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d6f4e60e736a00b50ec668ba1a9fe27afb083a3 Author: Sam Ravnborg Date: Thu Jan 17 15:21:12 2008 -0800 mm: fix section mismatch warning in page_alloc.c With CONFIG_HOTPLUG=n and CONFIG_HOTPLUG_CPU=y we saw following warning: WARNING: mm/built-in.o(.text+0x6864): Section mismatch: reference to .init.text: (between 'process_zones' and 'pageset_cpuup_callback') The culprit was zone_batchsize() which were annotated __devinit but used from process_zones() which is annotated __cpuinit. zone_batchsize() are used from another function annotated __meminit so the only valid option is to drop the annotation of zone_batchsize() so we know it is always valid to use it. Signed-off-by: Sam Ravnborg Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0e86f0a3b9329bbebadb01ca935208459df18c3 Author: Jesper Nilsson Date: Thu Jan 17 15:21:11 2008 -0800 CRIS v10: vmlinux.lds.S: ix kernel oops on boot and use common defines - Move alignment to page size of init data outside ifdef for BLK_DEV_INITRD. The reservation up to page size of memory after init data was previously not done if BLK_DEV_INITRD was undefined. This caused a kernel oops when init memory pages were freed after startup, data placed in the same page as the last init memory would also be freed and reused, with disastrous results. - Use macros for initcalls and .text sections. - Replace hardcoded page size constant with PAGE_SIZE define. - Change include/asm-cris/page.h to use the _AC macro to instead of testing __ASSEMBLY__. Signed-off-by: Jesper Nilsson Cc: Sam Ravnborg Cc: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit efe7cf2dcf4b72c7a9f991466d1f22850232244f Author: Len Brown Date: Thu Jan 17 15:21:10 2008 -0800 pnpacpi: print resource shortage message only once (more) Wups, previous patch was ineffective in 2 cases. http://bugzilla.kernel.org/show_bug.cgi?id=9535 Signed-off-by: Len Brown Reported-by: "Hartkopp, Oliver (K-EFE/E)" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46a39c1cd5d2f804b27e9a4be3fb1b510dda9570 Author: Eric Sandeen Date: Thu Jan 17 15:21:09 2008 -0800 hfs: fix coverity-found null deref Fix potential null deref introduced by commit cf0594625083111ae522496dc1c256f7476939c2 http://bugzilla.kernel.org/show_bug.cgi?id=9748 Signed-off-by: Eric Sandeen Cc: Roman Zippel Reported-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6915719b36a97d28fab576c6fa2a20364b435fe6 Author: Johannes Weiner Date: Thu Jan 17 15:21:08 2008 -0800 cpufreq: Initialise default governor before use When the cpufreq driver starts up at boot time, it calls into the default governor which might not be initialised yet. This hurts when the governor's worker function relies on memory that is not yet set up by its init function. This migrates all governors from module_init() to fs_initcall() when being the default, as was already done in cpufreq_performance when it was the only possible choice. The performance governor is always initialized early because it might be used as fallback even when not being the default. Fixes at least one actual oops where ondemand is the default governor and cpufreq_governor_dbs() uses the uninitialised kondemand_wq work-queue during boot-time. Signed-off-by: Johannes Weiner Cc: Dave Jones Cc: "Rafael J. Wysocki" Cc: Venkatesh Pallipadi Acked-by: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47cccd7d7cc1f2b6f34aadc9041fb991c6293cdd Author: Francois Romieu Date: Thu Jan 10 23:53:15 2008 +0100 ipg: fix Tx completion irq request The current logic will only request an ack for the first pending packet. No irq is triggered as soon as the CPU submits a few packets a bit quickly. Let's request an irq for every packet instead. Signed-off-by: Francois Romieu commit dafdec746f8c468bebf6b99f32a392ee6c8d0212 Author: Francois Romieu Date: Thu Jan 10 23:45:05 2008 +0100 ipg: fix queue stop condition in the xmit handler Signed-off-by: Francois Romieu commit 0da1b995aee447656c0eb77e4e32468e37f868a3 Author: Francois Romieu Date: Thu Jan 10 23:40:59 2008 +0100 ipg: plug Tx completion leak The Tx skb release could not free more than one skb per call. Add it to the fact that the xmit handler does not check for a queue full condition and you have a recipe to leak quickly. Let's release every pending Tx descriptor which has been given back to the host CPU by the network controller. The xmit handler suggests that it is done through the IPG_TFC_TFDDONE bit. Remove the former "curr" computing: it does not produce anything usable in its current form. Signed-off-by: Francois Romieu commit 227bc24d675d80de1cfb3ab72891cc932dadbc3b Author: Francois Romieu Date: Thu Jan 10 23:25:30 2008 +0100 ipg: balance locking in irq handler Spotted-by: Signed-off-by: Francois Romieu commit fb49161027e1938c34fc97d1136735e1d4209df6 Author: Dmitry Torokhov Date: Thu Jan 17 12:01:58 2008 -0500 Input: ALPS - fix sync loss on Acer Aspire 5720ZG The recently added support for Dell Volstro 1400 was causing protocol synchronization errors on Acer Aspire 5720ZG, fix it. Signed-off-by: Dmitry Torokhov commit 653e91d01fa4d39d2ed06a8c2096fef08b00ee7e Author: Andres Salomon Date: Thu Jan 17 12:01:51 2008 -0500 Input: psmouse - fix input_dev leak in lifebook driver The lifebook driver may register a second input device, but it never unregisters it. This fixes that. Signed-off-by: Andres Salomon Signed-off-by: Dmitry Torokhov commit 746b31a9d4e08240d267069bcf5084eb7e427ad7 Author: Andres Salomon Date: Thu Jan 17 12:01:30 2008 -0500 Input: psmouse - fix potential memory leak in psmouse_connect() If we successfully call input_register_device() in psmouse_connect() but sysfs_create_group() fails, we'll enter the error path without ever having called input_unregister_device() potentially leaking memory. Signed-off-by: Andres Salomon Signed-off-by: Dmitry Torokhov commit 62aa366d9b0158a81eace3b83e6b027789f7575b Author: Daniel Ritz Date: Thu Jan 17 12:01:18 2008 -0500 Input: usbtouchscreen - fix buffer overflow, make more egalax work Fix a buffer overflow in mutli-packet handling code. The overflow can only happen with eGalax devices and is even there very unlikely (only non-report packet are affected any only when truncated after the first byte). Also changes the mutli-packet handling code not to drop unknown packets, but rather just drop one byte. This allows synchronizing on report packets in the data stream. It's required for some egalax devices to work at all. Also remove the pointless 'flags' member of the device struct and set the version number to 0.6, plus some minor cleanups. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Daniel Ritz Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 6724f93463c332018e05f538a2ab3ce41eac0e8a Author: Micah Parrish Date: Thu Jan 17 12:01:04 2008 -0500 Input: mousedev - handle mice that use absolute coordinates Devices like the HP Integrated Remote Console Virtual Mouse, which are standard equipment on all Proliant and Integrity servers, produce absolute coordinates instead of relative coordinates. This is done to synchronize the position of the mouse cursor on the client desktop with the mouse cursor position on the server. Mousedev is not designed to pass those absolute events directly to X, but it can translate them into relative movements. It currently does this for tablet like devices and touchpads. This patch merely tells it to also include a device with ABS_X, ABS_Y, and mouse buttons in its list of devices to process input for. This patch enables the mouse pointer to move when using the remote console. Signed-off-by: Micah Parrish Signed-off-by: Dmitry Torokhov commit 6320bcebc0ee0bafc61f293bec2d0809171f6b1d Author: David S. Miller Date: Thu Jan 17 01:32:09 2008 -0800 [SPARC64]: Fix hypervisor TLB operation error reporting. 1) Trap level wasn't being passed down properly, we need to move it from %l4 into the correct outgoing arg register. 2) Although the TPC often provides the most direct clue, we have the caller PC so we should provide that as well. Signed-off-by: David S. Miller commit e415e6ea0cd36ece29c7b12232286b5ca097ac96 Author: David S. Miller Date: Tue Jan 15 22:50:08 2008 -0800 [NIU]: Fix 1G PHY link state handling. The code in link_status_1g() computes the active speed and duplex but does not update the link config state with those values. As a result the link speed is not reported correctly and the XIF is not reprogrammed properly on link up events. Signed-off-by: David S. Miller commit d2c7ddd6261eb885091cf6ddbcfae01f4216fb8e Author: David S. Miller Date: Tue Jan 15 22:43:24 2008 -0800 [NET]: Fix TX timeout regression in Intel drivers. This fixes a regression added by changeset 53e52c729cc169db82a6105fac7a166e10c2ec36 ("[NET]: Make ->poll() breakout consistent in Intel ethernet drivers.") As pointed out by Jesse Brandeburg, for three of the drivers edited above there is breakout logic in the *_clean_tx_irq() code to prevent running TX reclaim forever. If this occurs, we have to elide NAPI poll completion or else those TX events will never be serviced. Signed-off-by: David S. Miller Acked-by: Jesse Brandeburg commit d8c89eb3a12f0da96d049bd515c7fa3702e511c5 Merge: 456ef15... fb1dac9... Author: Linus Torvalds Date: Wed Jan 16 09:55:49 2008 -0800 Merge branch 'v2.6.24-rc7-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep * 'v2.6.24-rc7-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep: lockdep: more hardirq annotations for notify_die() lockdep: fix workqueue creation API lockdep interaction lockdep: fix internal double unlock during self-test commit 456ef1553cb2b06729d64c1d1f0f2bda34e9b201 Author: Tejun Heo Date: Wed Jan 16 12:10:53 2008 +0900 sysfs: fix bugs in sysfs_rename/move_dir() sysfs_rename/move_dir() have the following bugs. - On dentry lookup failure, kfree() is called on ERR_PTR() value. - sysfs_move_dir() has an extra dput() on success path. Fix them. Signed-off-by: Tejun Heo Signed-off-by: Linus Torvalds commit e49452c67703d3647467d65275fb893589384fed Author: Tejun Heo Date: Wed Jan 16 12:06:14 2008 +0900 sysfs: make sysfs_lookup() return ERR_PTR(-ENOENT) on failed lookup sysfs tries to keep dcache a strict subset of sysfs_dirent tree by shooting down dentries when a node is removed, that is, no negative dentry for sysfs. However, the lookup function returned NULL and thus created negative dentries when the target node didn't exist. Make sysfs_lookup() return ERR_PTR(-ENOENT) on lookup failure. This fixes the NULL dereference bug in sysfs_get_dentry() discovered by bluetooth rfcomm device moving around. Signed-off-by: Tejun Heo Signed-off-by: Linus Torvalds commit d101f6496d51cbeb285f531dff059ce0ef28ffe3 Author: Ivo van Doorn Date: Fri Jan 11 20:53:07 2008 +0100 rt2x00: Fix ieee80211 payload alignment As Johannes Berg indicated, the NET_IP_ALIGN doesn't need to be used for ieee80211 frames. This means we can simplify the alignment calculation to just use the result of the header size modulus 4 as frame alignment. Furthermore we shouldn't use NET_IP_ALIGN in rt2x00usb because it could be 0 on some architectures and we absolutely need to have 2 bytes reserved for possible aligning. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit a38db5b6219d88e2b48f07472c436b19b864f93c Author: Stefano Brivio Date: Sun Jan 13 18:30:14 2008 +0100 b43: fix use-after-free rfkill bug Fix rfkill code which caused a use-after-free bug. Signed-off-by: Stefano Brivio Acked-by: Michael Buesch Signed-off-by: John W. Linville commit 8ff9d21ee2ac7eceeb6ba3da52c3472dcab435e4 Author: Stefano Brivio Date: Sat Jan 12 23:12:26 2008 +0100 ipw2200: fix typo in kerneldoc Fix a typo in kerneldoc for ipw2200. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit 436c8854a05add153a9003b3aa19e54851ed902f Author: Marc Pignat Date: Fri Jan 11 16:12:28 2008 +0100 wireless/libertas support for 88w8385 sdio older revision Identifiaction of another revision of 88w8385 in sdio mode. Signed-off-by: Marc Pignat Acked-by: Pierre Ossman Signed-off-by: John W. Linville commit e52742deef04ed7babec0f5866c867dd15d449f0 Author: Randy Dunlap Date: Thu Jan 10 14:31:30 2008 -0800 hostap: section mismatch warning Fix section mismatch by changing variable name to match one of the whitelisted (allowable) names for pointing into init data: WARNING: vmlinux.o(.data+0xce618): Section mismatch: reference to .init.data:prism2_plx_id_table (between 'prism2_plx_drv_id' and 'dev_info') Signed-off-by: Randy Dunlap Acked-by: Sam Ravnborg Signed-off-by: John W. Linville commit fb1dac909d94ff807cd833d340c6827c3a957159 Author: Peter Zijlstra Date: Wed Jan 16 09:51:59 2008 +0100 lockdep: more hardirq annotations for notify_die() On Sat, 2007-12-29 at 18:06 +0100, Marcin Slusarz wrote: > Hi > Today I've got this (while i was upgrading my gentoo box): > > WARNING: at kernel/lockdep.c:2658 check_flags() > Pid: 21680, comm: conftest Not tainted 2.6.24-rc6 #63 > > Call Trace: > [] check_flags+0x1c7/0x1d0 > [] lock_acquire+0x57/0xc0 > [] __atomic_notifier_call_chain+0x60/0xd0 > [] atomic_notifier_call_chain+0x11/0x20 > [] notify_die+0x2e/0x30 > [] do_divide_error+0x5a/0xa0 > [] trace_hardirqs_on_thunk+0x35/0x3a > [] trace_hardirqs_on+0xd9/0x180 > [] trace_hardirqs_on_thunk+0x35/0x3a > [] error_exit+0x0/0xa9 > > possible reason: unannotated irqs-off. > irq event stamp: 4693 > hardirqs last enabled at (4693): [] trace_hardirqs_on_thunk+0x35/0x3a > hardirqs last disabled at (4692): [] trace_hardirqs_off_thunk+0x35/0x37 > softirqs last enabled at (3546): [] __do_softirq+0xb3/0xd0 > softirqs last disabled at (3521): [] call_softirq+0x1c/0x30 more early fixups for notify_die().. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit eb13ba873881abd5e15af784756a61af635e665e Author: Johannes Berg Date: Wed Jan 16 09:51:58 2008 +0100 lockdep: fix workqueue creation API lockdep interaction Dave Young reported warnings from lockdep that the workqueue API can sometimes try to register lockdep classes with the same key but different names. This is not permitted in lockdep. Unfortunately, I was unaware of that restriction when I wrote the code to debug workqueue problems with lockdep and used the workqueue name as the lockdep class name. This can obviously lead to the problem if the workqueue name is dynamic. This patch solves the problem by always using a constant name for the workqueue's lockdep class, namely either the constant name that was passed in or a string consisting of the variable name. Signed-off-by: Johannes Berg Signed-off-by: Ingo Molnar Signed-off-by: Peter Zijlstra commit 5a26db5bd25cf4bf32ae9fa9f6136b6b6d5b45c5 Author: Nick Piggin Date: Wed Jan 16 09:51:58 2008 +0100 lockdep: fix internal double unlock during self-test Lockdep, during self-test (when it was simulating double unlocks) was sometimes unconditionally unlocking a spinlock when it had not been locked. This won't work for ticket locks. Signed-off-by: Nick Piggin Signed-off-by: Ingo Molnar Signed-off-by: Peter Zijlstra