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 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 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