commit 62d0cfcb27cf755cebdc93ca95dabc83608007cdAuthor: Linus Torvalds Date: Sun Feb 4 10:44:54 2007 -0800

Linux 2.6.20

commit 40c373cc3af9720d1cec0e32c3da26b1d220a95bAuthor: Frédéric Riss Date: Tue Jan 30 21:41:17 2007 +0100

[PATCH] EFI x86: pass firmware call parameters on the stack When calling into the EFI firmware, the parameters need to be passed on the stack. The recent change to use -mregparm=3 breaks x86 EFI support. This patch is needed to allow the new Intel-based Macs to suspend to ram (efi.get_time is called during the suspend phase). Signed-off-by: Frederic Riss Signed-off-by: Linus Torvalds

commit 886ae1fa1380309d91cdb7e67bd4bf71e053c1d5Author: Al Viro Date: Sun Feb 4 03:02:17 2007 +0000

[PATCH] fix rtl8150 That code doesn't do what its author apparently thought it would do... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit 259886a7c4e4eb0089181e800d1f477cb3786875Author: Jeff Garzik Date: Sat Feb 3 01:14:03 2007 -0800

[PATCH] x86-64: define dma noncoherent API functions x86-64 is missing these: Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 72253943f7281fc5c6249d9cafd63e7de3266fe9Author: John Keller Date: Sat Feb 3 01:14:02 2007 -0800

[PATCH] Altix: more ACPI PRT support The SN Altix platform does not conform to the IOSAPIC IRQ routing model. Add code in acpi_unregister_gsi() to check if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) and return. Due to an oversight, this code was not added previously when similar code was added to acpi_register_gsi(). http://marc.theaimsgroup.com/?l=linux-acpi&m=116680983430121&w=2 Signed-off-by: John Keller

Acked-by: Len Brown Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit b2e895dbd80c420bfc0937c3729b4afe073b3848Author: Andrew Morton Date: Sat Feb 3 01:14:01 2007 -0800

[PATCH] revert blockdev direct io back to 2.6.19 version Andrew Vasquez is reporting as-iosched oopses and a 65% throughput slowdown due to the recent special-casing of direct-io against blockdevs. We don't know why either of these things are occurring. The patch minimally reverts us back to the 2.6.19 code for a 2.6.20 release. Cc: Andrew Vasquez Cc: Ken Chen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 8560a10e16faccafdc2e26c4873bf4edfbbf651eAuthor: Mike Frysinger Date: Sat Feb 3 01:13:55 2007 -0800

[PATCH] alpha: fix epoll syscall enumerations We went and named them __NR_sys_foo instead of __NR_foo. It may be too late to change this, but we can at least add the proper names now. Signed-off-by: Mike Frysinger Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 24d8f6aded45aca87dec6d9c037b75b189e3d731Author: Peter Korsgaard Date: Sat Feb 3 01:13:50 2007 -0800

[PATCH] net/smc911x: match up spin lock/unlock smc911x_phy_configure's error handling unconditionally unlocks the spinlock even if it wasn't locked. Patch fixes it. Signed-off-by: Peter Korsgaard Cc: Jeff Garzik Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 29a002776ba5ef170446910b1f93c480cdd43706Author: Magnus Damm Date: Sat Feb 3 01:13:48 2007 -0800

[PATCH] kexec: Avoid migration of already disabled irqs (ia64)

This patch fixes up ia64 kexec support for HP rx2620 hardware. It does this by skipping migration of already disabled irqs. This is most likely a problem on other ia64 platforms as well, but I've only been able to reproduce it on one machine so far. The full story is that handle_bad_irq() gets invoked before starting the new kernel without this patch. This seems to happen when fixup_irqs() calls generic_handle_irq() on already migrated (and disabled) irqs. So by avoiding migration of disabled irqs we stay away of handle_bad_irq(). The code has been tested on three different ia64 machines, all with good results. It is possible to trigger the same bug by offlining a processor using echo 0 > /sys/devices/system/cpu/cpuX/online. More detailed information is available in the following mail thread: http://lists.osdl.org/pipermail/fastboot/2007-January/thread.html#5774 Signed-off-by: Magnus Damm Acked-by: Simon Horman Acked-by: Zou, Nanhai Acked-by: Jay Lan Acked-by: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit dee11c2364f51cac53df17d742a0c69097e29a4eAuthor: Ken Chen Date: Sat Feb 3 01:13:45 2007 -0800

[PATCH] aio: fix buggy put_ioctx call in aio_complete - v2 An AIO bug was reported that sleeping function is being called in softirq context: BUG: warning at kernel/mutex.c:132/__mutex_lock_common() Call Trace: [] __mutex_lock_slowpath+0x640/0x6c0 [] mutex_lock+0x20/0x40 [] flush_workqueue+0xb0/0x1a0 [] __put_ioctx+0xc0/0x240 [] aio_complete+0x2f0/0x420 [] finished_one_bio+0x200/0x2a0 [] dio_bio_complete+0x1c0/0x200 [] dio_bio_end_aio+0x60/0x80 [] bio_endio+0x110/0x1c0 [] __end_that_request_first+0x180/0xba0 [] end_that_request_chunk+0x30/0x60 [] scsi_end_request+0x50/0x300 [scsi_mod] [] scsi_io_completion+0x200/0x8a0 [scsi_mod] [] sd_rw_intr+0x330/0x860 [sd_mod] [] scsi_finish_command+0x100/0x1c0 [scsi_mod] [] scsi_softirq_done+0x230/0x300 [scsi_mod] [] blk_done_softirq+0x160/0x1c0 [] __do_softirq+0x200/0x240

[] do_softirq+0x70/0xc0 See report: http://marc.theaimsgroup.com/?l=linux-kernel&m=116599593200888&w=2 flush_workqueue() is not allowed to be called in the softirq context. However, aio_complete() called from I/O interrupt can potentially call put_ioctx with last ref count on ioctx and triggers bug. It is simply incorrect to perform ioctx freeing from aio_complete. The bug is trigger-able from a race between io_destroy() and aio_complete(). A possible scenario: cpu0 cpu1 io_destroy aio_complete wait_for_all_aios { __aio_put_req ... ctx->reqs_active--; if (!ctx->reqs_active) return; } ... put_ioctx(ioctx) put_ioctx(ctx); __put_ioctx bam! Bug trigger! The real problem is that the condition check of ctx->reqs_active in wait_for_all_aios() is incorrect that access to reqs_active is not being properly protected by spin lock. This patch adds that protective spin lock, and at the same time removes all duplicate ref counting for each kiocb as reqs_active is already used as a ref count for each active ioctx. This also ensures that buggy call to flush_workqueue() in softirq context is eliminated. Signed-off-by: "Ken Chen" Cc: Zach Brown Cc: Suparna Bhattacharya Cc: Benjamin LaHaise Cc: Badari Pulavarty Cc: Acked-by: Jeff Moyer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 3e8219806c33b64a00b0013f96f735451f30c64cAuthor: Adrian Bunk Date: Fri Feb 2 19:33:52 2007 -0800

[NETFILTER]: nf_conntrack_h323: fix compile error with CONFIG_IPV6=m, CONFIG_NF_CONNTRACK_H323=y Fix this by letting NF_CONNTRACK_H323 depend on (IPV6 || IPV6=n). Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller

commit 40e0cb004a6d4a7ad577724e451e8dbd6cba5a89Author: Patrick McHardy Date: Fri Feb 2 19:33:11 2007 -0800

[NETFILTER]: ctnetlink: fix compile failure with NF_CONNTRACK_MARK=n CC net/netfilter/nf_conntrack_netlink.o net/netfilter/nf_conntrack_netlink.c: In function 'ctnetlink_conntrack_event': net/netfilter/nf_conntrack_netlink.c:392: error: 'struct nf_conn' has no member named 'mark' make[3]: *** [net/netfilter/nf_conntrack_netlink.o] Error 1 Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller

commit 017f2e37ae19ccd28e5edd965741fc374194c5ddAuthor: Nagendra Singh Tomar Date: Fri Feb 2 17:34:56 2007 +0530

[SCSI] sd: udev accessing an uninitialized scsi_disk field results in a crash sd_probe() calls class_device_add() even before initializing the sdkp->device variable. class_device_add() eventually results in the user mode udev program to be called. udev program can read the the allow_restart attribute of the newly created scsi device. This is resulting in a crash as the show function for allow_restart (i.e sd_show_allow_restart) returns the attribute value by reading the sdkp->device->allow_restart variable. As the sdkp->device is not initialized before calling the user mode hotplug helper, this results in a crash. The patch below solves it by calling class_device_add() only after the necessary fields in the scsi_disk structure are initialized properly. Signed-off-by: Nagendra Singh Tomar Signed-off-by: James Bottomley

commit 49c8042996c84f0df6c49ea2e28a7ef38cd7d773Author: Brian King Date: Tue Jan 30 11:32:26 2007 -0600

libata: Initialize nbytes for internal sg commands Some LLDDs, like ipr, use nbytes and pad_len to determine the total data transfer length of a command. Make sure nbytes gets initialized for internally generated commands. Signed-off-by: Brian King Signed-off-by: Jeff Garzik

commit 0777721c9b270f087bf967369c9acbee3f1a12aeAuthor: Alan Date: Wed Jan 31 17:47:24 2007 +0000

libata: Fix ata_busy_wait() kernel docs

> Looks like you should use ata_busy_wait() here, rather than reproducing > the same code again. It waits in 10uS chunks while 1uS chunks were used in the workaround. Could indeed do that once I know the fix is right. While I'm at it the ata_busy_wait kerneldoc is borked so here's a fix Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik

commit 05c39e502e964ae66336ca8e6960b200cff26f94Author: Alan Date: Wed Jan 31 17:14:38 2007 +0000

pata_via: Correct missing comments The 8237S was added to the chipsets but not to the comments. Fix this Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik

commit 54494f3a8339baad5e8f9d9b87d3ea6a3aa4f540Author: Alan Date: Wed Jan 31 17:10:46 2007 +0000

pata_atiixp: propogate cable detection hack from drivers/ide to the new driver Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik

commit 77280989673ee1ef736a92617f52e2be45651833Author: Tejun Heo Date: Fri Feb 2 14:51:09 2007 +0900

ahci/pata_jmicron: fix JMicron quirk For all JMicrons except for 361 and 368, AHCI mode enable bits in the Control(1) should be set. This used to be done in both ahci and pata_jmicron but while moving programming to PCI quirk, it was removed from ahci part while still left in pata_jmicron. The implemented JMicron PCI quirk was incorrect in that it didn't program AHCI mode enable bits. If pata_jmicron is loaded first and programs those bits, the ahci ports work; otherwise, ahci device detection fails miserably. This patch makes JMicron PCI quirk clear SATA IDE mode bits and set AHCI mode bits and remove the respective part from pata_jmicron. Tested on JMB361, 363 and 368. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik

commit 719d96991ac8d96ea318c6d56500e7ed690a4ac0Author: Evgeniy Dushistov Date: Fri Feb 2 11:36:34 2007 +0300

[PATCH] MAINTAINERS: ufs entry

Mark ufs file system as maintainable, and add me as maintainer, to help people find appropriate person to assign bugs. Signed-off-by: Evgeniy Dushistov Signed-off-by: Linus Torvalds

commit 435f8a605d3b56bb96212f4d70b62ecbd0629340Author: Linus Torvalds Date: Fri Feb 2 08:07:42 2007 -0800

Revert "[PATCH] fix typo in geode_configre()@cyrix.c" This reverts commit e4f0ae0ea63caceff37a13f281a72652b7ea71ba. It's not wrong, but it's not right either, and everybody seems to agree that the right fix is probably to do the ccr3 write after the ccr4 one (and that we also should clean it up a bit). And after that we need to really validate that all the bits that we write to ccr4 actually do work. The old 2.6.19 code was insane, and basically didn't change ccr4 at all (even though it certainly looks like it was the *intent* to do so). So let's revert the change that may fix things, just because it's not what was actually ever tested when the code was written, even if it _was_ the intent. There's a discussion on http://lkml.org/lkml/2007/1/9/63 that was started by the patch that now gets reverted, and that discussion may well contain the proper long-term fix. Suggested-by: Adrian Bunk Acked-by: Andrew Morton Signed-off-by: Linus Torvalds

commit a55eb05a57a981f16325d035ee3a3ad10485ea0dAuthor: Jens Osterkamp Date: Thu Feb 1 12:07:47 2007 +0100

spidernet : fix memory leak in spider_net_stop We forget to call spider_net_free_rx_chain_contents which does the actual dev_kfree_skb. New skbs are allocated from skbuff_head_cache on each "ifconfig up" letting the cache grow infinitely. This patch fixes it. Signed-off-by: Jens Osterkamp Signed-off-by: Jeff Garzik

commit a53a33da864a81a238ee84055c8ced775ee25350Author: Auke Kok Date: Wed Jan 31 11:02:46 2007 -0800

e100: fix napi ifdefs removing needed code e100: fix napi ifdefs removing needed code From: Auke Kok

The e100 driver is NAPI mode only. We need to netif_poll_disable during suspend and shutdown. The non-NAPI driver code was removed and is only avaiable in the out-of-tree e100 kernel driver. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik

commit b659f44e4e144bae02c5beaba78a37db60783ba2Author: Michael Chan Date: Fri Feb 2 00:46:35 2007 -0800

[BNX2]: PHY workaround for 5709 A0. 5709 A0 copper devices will not link up with some link partners without this workaround. Update driver to 1.5.5. Signed-off-by: Michael Chan Signed-off-by: David S. Miller

commit 239a87c87660d3b97a467a661eec927f0dfa9891Author: Patrick McHardy Date: Fri Feb 2 00:40:36 2007 -0800

[NET_SCHED]: act_ipt: fix regression in ipt action The x_tables patch broke target module autoloading in the ipt action by replacing the ipt_find_target call (which does autoloading) by xt_find_target (which doesn't do autoloading). Additionally xt_find_target may return ERR_PTR values in case of an error, which are not handled. Use xt_request_find_target, which does both autoloading and ERR_PTR handling properly. Also don't forget to drop the target module reference again when xt_check_target fails. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller

commit 51bcf092917bfaa88d762879d0bbfe7619e8c16cAuthor: Bob Breuer Date: Thu Feb 1 20:24:35 2007 -0800

[SPARC32]: Fix over-optimization by GCC near ip_fast_csum. In some cases such as: iph->check = 0; iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl); GCC may optimize out the previous store. Observed as a failure of NFS over udp (bad checksums on ip fragments) when compiled with GCC 3.4.2. Signed-off-by: Bob Breuer Signed-off-by: David S. Miller

commit e34efe3b100d0fbdf053128956c3dd0bc68754d6Author: Haavard Skinnemoen Date: Thu Feb 1 16:49:31 2007 +0100

[PATCH] Remove avr32@atmel.com from MAINTAINERS avr32@atmel.com is a technical support address and is not really appropriate for sending patches. Lots of annoying automatics getting in the way. I'm still the maintainer of all the entries touched by this patch, so nothing changes with regard to the "Supported" status of the AVR32 architecture or the macb driver. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds

commit fb594d31aa2d133ea89d4ead964c51262b331407Author: Bartlomiej Zolnierkiewicz Date: Thu Feb 1 14:12:27 2007 +0100

[PATCH] via82cxxx: fix typo ("cx7000" should be corrected to "cx700") Noticed by JosephChan@via.com.tw. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Linus Torvalds

commit d346cce308f7fc99c7ffdb62060ed404fa340a1cAuthor: Randy Dunlap Date: Wed Jan 31 23:48:17 2007 -0800

[PATCH] sysrq: showBlockedTasks is sysrq-W Change SysRq showBlockedTasks from sysrq-X to sysrq-W and show that in the Help message. It was previously done via X, but X is already used for Xmon on ppc & powerpc platforms and this collision needs to be avoided. All callers of register_sysrq_key() are now marked in the sysrq op/key table. I didn't mark 'h' as Help because Help is just printed for any unknown key, such as '?'. Added some omitted sysrq key entries in the sysrq.txt file. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 7d8952440f4090522b740257f1c6b2cf96413969Author: Guillaume Chazarain Date: Wed Jan 31 23:48:14 2007 -0800

[PATCH] procfs: Fix listing of /proc/NOT_A_TGID/task Listing /proc/PID/task were PID is not a TGID should not result in duplicated entries. [g ~]$ pidof thunderbird-bin

2751 [g ~]$ ls /proc/2751/task 2751 2770 2771 2824 2826 2834 2835 2851 2853 [g ~]$ ls /proc/2770/task 2751 2770 2771 2824 2826 2834 2835 2851 2853 2770 2771 2824 2826 2834 2835 2851 2853 [g ~]$ Signed-off-by: Guillaume Chazarain Acked-by: "Eric W. Biederman" Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 432bd6cbf9f016f5480153b1cdfbd046f8d4fb1eAuthor: Avi Kivity Date: Wed Jan 31 23:48:13 2007 -0800

[PATCH] KVM: fix lockup on 32-bit intel hosts with nx disabled in the bios Intel hosts, without long mode, and with nx support disabled in the bios have an efer that is readable but not writable. This causes a lockup on switch to guest mode (even though it should exit with reason 34 according to the documentation). Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 6a4c24ec52128c1f57b7d2d24cf4dd13fc23f474Author: Andrew Morton Date: Wed Jan 31 23:48:13 2007 -0800

[PATCH] pci: remove warning messages Remove these recently-added warnings. They don't tell us anythng very interesting and Kumar says "On an embedded PPC reference system I see this message 6 times when I've got no cards in the PCI slots." Acked-by: Kumar Gala Acked-by: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit cb7468ef4cce8f240604b80b82ac157fa9930e94Author: Jean Delvare Date: Wed Jan 31 23:48:12 2007 -0800

[PATCH] via quirk update Add special handling for the VT82C686. Signed-off-by: Jean Delvare Cc: Alan Cox Cc: Nick Piggin Signed-off-by: Andrew Morton

Signed-off-by: Linus Torvalds

commit 04add672cf98a788e9e0d753b2ccfa4a3a0caf56Author: Al Viro Date: Thu Feb 1 13:53:04 2007 +0000

[PATCH] uml-i386: fix build breakage with CONFIG_HIGHMEM missing helper used by arch/i386/mm/highmem.c, which is pulled into build on that configuration. Signed-off-by: Al Viro Acked-by: Jeff Dike Signed-off-by: Linus Torvalds

commit 9d6ed92196f7acdd1052b0828bb1e2f1a7241815Author: Al Viro Date: Thu Feb 1 13:52:59 2007 +0000

[PATCH] radio modems sitting on serial port are not for s390 Won't build (request_irq()/free_irq()), even if you manage to find an s390 box with 8250-compatible UART they are expecting. Signed-off-by: Al Viro Acked-by: Martin Schwidefsky Signed-off-by: Linus Torvalds

commit b4cff8464b12b71fd6573c9b9dd762d2d390ef6cAuthor: Al Viro Date: Thu Feb 1 13:52:33 2007 +0000

[PATCH] sanitize sections for sparc32 smp a) sun4d_boot_one_cpu() should be __cpuinit (called only from __cpuinit __cpu_up(), for one thing, leads to calls of __cpuinit functions for another). b) got externs in arch/sparc/kernel/smp.c to match reality. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit 472ba91dd9ce76b586d4d513f7e3448330eec7ebAuthor: Al Viro Date: Thu Feb 1 13:52:54 2007 +0000

[PATCH] efi_set_rtc_mmss() is not __init fix the extern in efi.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit 2a3d4f1f1f839e354ebd7d40b2d5d8ac8481a930Author: Al Viro Date: Thu Feb 1 13:52:23 2007 +0000

[PATCH] __crc_... is intended to be absolute i386 boot/compressed/relocs checks for absolute symbols and warns about unexpected ones. If you build with modversions, you get ~2500 warnings

about __crc_. These suckers are really absolute symbols - we do _not_ want to modify them on relocation. They are generated by genksyms - EXPORT_... generates a weak alias, then genksyms produces an ld script with __crc_ = and it's fed to ld to produce the final object file. Their only use is to match kernel and module at modprobe time; they _must_ be absolute. boot/compressed/relocs has a whitelist of known absolute symbols, but it doesn't know about __crc_... stuff. As the result, we get shitloads of false positives on any ld(1) version. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit 9abcf40b1d1443e6f0ef86e6a822193142a34abcAuthor: Al Viro Date: Thu Feb 1 13:52:48 2007 +0000

[PATCH] fork_idle() should be __cpuinit, not __devinit Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit fc2dd2e51a1940acac665696e6a70a1a73dc90a4Author: Al Viro Date: Thu Feb 1 13:52:43 2007 +0000

[PATCH] endianness bug: ntohl() misspelled as >> 24 in fh_verify(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit eb7972271720bfc64dc8bacc5b15f874c0bcc859Author: Al Viro Date: Thu Feb 1 13:52:38 2007 +0000

[PATCH] ide section fixes a) cleanup_module() should be __exit b) externs should match reality Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit aaba6d4bf6f2a52a0c30ad1da4374ba24bd7163bAuthor: Al Viro Date: Thu Feb 1 13:52:28 2007 +0000

[PATCH] mca_nmi_hook() can be called at any point ... and having it __init is a bad idea. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit e7bc537db9e13adee1f294aa370f16d80f40b73dAuthor: Al Viro Date: Thu Feb 1 13:08:45 2007 +0000

[PATCH] fix frv headers_check a) registers.h is really needed there b) include of asm-generic/termios should be under __KERNEL__ c) includes of asm-generic/{memory_model,page} should be under __KERNEL (nothing in there that would work in userland) d) a lot of stuff in ptrace.h should be under __KERNEL__. Signed-off-by: Al Viro Acked-by: David Howells Signed-off-by: Linus Torvalds

commit 6fd6b17c6d9713f56b5f20903ec3e00fa6cc435eAuthor: Linus Torvalds Date: Wed Jan 31 16:43:36 2007 -0800

Revert "[PATCH] mm: micro optimise zone_watermark_ok" This reverts commit e80ee884ae0e3794ef2b65a18a767d502ad712ee. Pawel Sikora had a boot-time oops due to it - because the sign change invalidates the following comparisons, since 'free_pages' can be negative. The micro-optimization just isn't worth it. Bisected-by: Pawel Sikora Acked-by: Andrew Morton Cc: Nick Piggin Signed-off-by: Linus Torvalds

commit a608ab9cb6a5050394498b2520c6e7c162f4e2cfAuthor: Al Viro Date: Tue Jan 2 10:39:10 2007 +0000

netxen patches Have fun. >From 24f4a1a77431575a9cdfaae25adda85842099f70 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 1 Jan 2007 15:22:56 -0500 Subject: [PATCH] netxen trivial annotations Signed-off-by: Al Viro Signed-off-by: Jeff Garzik

commit 2e5530236645a042e1481aa19879b819c3e8f5c9Author: Patrick McHardy Date: Tue Jan 30 21:36:09 2007 -0800

[NETFILTER]: xt_hashlimit: fix ip6tables dependency IP6_NF_IPTABLES=m, CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y results in a linker error since ipv6_find_hdr is defined in ip6_tables.c. Fix similar to Adrian Bunk's H.323 conntrack patch: selecting ip6_tables to be build as module requires hashlimit to be built as module as well.

Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller

commit f56df2f4db6e4af87fb8e941cff69f4501a111dfAuthor: Linus Torvalds Date: Tue Jan 30 19:42:57 2007 -0800

Linux 2.6.20-rc7 Ok, so I said there wouldn't be another -rc. I lied. Signed-off-by: Linus Torvalds

commit 41c57a87183a7c458d86f78966d69d4bf18ea0b7Author: David Barksdale Date: Tue Jan 30 14:36:25 2007 -0800

[PATCH] IPMI: fix timeout list handling Fix a dangling pointer bug in ipmi_timeout_handler. A list of timedout messages is not re-initialized before reuse, causing the head of the list to point to freed memory. Signed-off-by: David Barksdale Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit fa8609da993b04dc2dd762173a6d0ab1a192e256Author: Andrew Morton Date: Tue Jan 30 14:36:24 2007 -0800

[PATCH] ntfs: kmap_atomic() atomicity fix The KM_BIO_SRC_IRQ kmap slot requires local irq protection. Acked-by: Anton Altaparmakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 3896625d0badd53dbc34d584861a36ba7eb4613fAuthor: Jeff Dike Date: Tue Jan 30 14:36:17 2007 -0800

[PATCH] uml: fix signal frame alignment Use the same signal frame alignment calculations as the underlying architecture. x86_64 appeared to do this, but the "- 8" was really subtracting 8 * sizeof(struct rt_sigframe) rather than 8 bytes. UML/i386 might have been OK, but I changed the calculation to match i386 just to be sure. Signed-off-by: Jeff Dike Cc: Cc: Adrian Bunk Cc: Paolo 'Blaisorblade' Giarrusso Acked-by: Antoine Martin

Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 99abaf51e25f7d4ac2081e5cdc1f01baa0543514Author: ethanhsiao@jmicron.com Date: Tue Jan 30 14:36:13 2007 -0800

[PATCH] jmicron: 40/80pin primary detection jmicron module detects all JMB36x as JMB361 and PATA0 has wrong pin status of XICBLID. Cc: Jeff Garzik Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit c06bb5d49d8b240876c7c5019197e6a7bd33bcf7Author: Jean Delvare Date: Tue Jan 30 14:36:09 2007 -0800

[PATCH] Fix VIA quirks Fix VIA quirks that were recently broken by Alan Cox in the upstream kernel (commit 1597cacbe39802d86656d1f2e6329895bd2ef531). My understanding is that pci_find_present() doesn't work yet at the time the quirks are run. So I used a two-step quirk as is done for some other quirks already. First we detect the VIA south bridges and set the right low and high device limits, then we are ready to actually run the quirks on the affected devices. Signed-off-by: Jean Delvare Acked-by: Alan Cox Acked-by: Nick Piggin Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit ab40c5c6b6861ee71fd97f2611027b01e9ec4da0Author: Masami Hiramatsu Date: Tue Jan 30 14:36:06 2007 -0800

[PATCH] kprobes: replace magic numbers with enum Replace the magic numbers with an enum, and gets rid of a warning on the specific architectures (ex. powerpc) on which the compiler considers 'char' as 'unsigned char'. Signed-off-by: Masami Hiramatsu Cc: Prasanna S Panchamukhi Cc: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy

Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 46bae1a9a767f3ae8e636d96f9b95703df34b398Author: Neil Brown Date: Tue Jan 30 14:36:01 2007 -0800

[PATCH] Remove warning: VFS is out of sync with lock manager But keep it as a dprintk The message can be generated in a quite normal situation: If a 'lock' request is interrupted, then the lock client needs to record that the server has the lock, incase it does. When we come the unlock, the server might say it doesn't, even though we think it does (or might) and this generates the message. Signed-off-by: Neil Brown Acked-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit ec268be36e79d99443efc4be3a617d6efc6f719bAuthor: Mike Frysinger Date: Tue Jan 30 14:35:55 2007 -0800

[PATCH] translate dashes in filenames for headers install The current filename->define translation does not scrub dashes so when creating stub defines for like asm-x86_64/ptrace-abi.h, we get: #define __ASM_STUB_PTRACE-ABI_H gcc just hates that sort of thing :) trivial attached patch adds - to the tr list to scrub it to _ Signed-off-by: Mike Frysinger Cc: David Woodhouse Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 0d59a01bc461bbab4017ff449b8401151ef44cf6Author: Adam Litke Date: Tue Jan 30 14:35:39 2007 -0800

[PATCH] Don't allow the stack to grow into hugetlb reserved regions When expanding the stack, we don't currently check if the VMA will cross into an area of the address space that is reserved for hugetlb pages. Subsequent faults on the expanded portion of such a VMA will confuse the low-level MMU code, resulting in an OOPS. Check for this. Signed-off-by: Adam Litke Cc: David Gibson Cc: William Lee Irwin III Cc: Hugh Dickins Cc: Signed-off-by: Andrew Morton

Signed-off-by: Linus Torvalds

commit e533ca16f31f9e5abfaf5d8c7dbe7095f01474b6Author: Vlad Yasevich Date: Tue Jan 30 14:36:14 2007 -0800

[SCTP]: Force update of the rto when processing HB-ACK When processing a HEARTBEAT-ACK it's possible that the transport rto timers will not be updated because a prior T3-RTX processing would have cleared the rto_pending flag on the transport. However, if we received a valid HEARTBEAT-ACK, we want to force update the rto variables, so re-set the rto_pending flag before calling sctp_transport_update_rto(). Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller

commit 29556526b970c2e7d4ca808b6082c33981adfdffAuthor: Li Yewang Date: Tue Jan 30 14:33:20 2007 -0800

[IPV6]: fix BUG of ndisc_send_redirect() When I tested IPv6 redirect function about kernel 2.6.19.1, and found that the kernel can send redirect packets whose target address is global address, and the target is not the actual endpoint of communication. But the criteria conform to RFC2461, the target address defines as following: Target Address An IP address that is a better first hop to use for he ICMP Destination Address. When the target is the actual endpoint of communication, i.e., the destination is a neighbor, the Target Address field MUST contain the same value as the ICMP Destination Address field. Otherwise the target is a better first-hop router and the Target Address MUST be the router's link-local address so that hosts can uniquely identify routers. According to this definition, when a router redirect to a host, the target address either the better first-hop router's link-local address or the same as the ICMP destination address field. But the function of ndisc_send_redirect() in net/ipv6/ndisc.c, does not check the target address correctly. There is another definition about receive Redirect message in RFC2461: 8.1. Validation of Redirect Messages A host MUST silently discard any received Redirect message that does not satisfy all of the following validity checks: ...... - The ICMP Target Address is either a link-local address (when redirected to a router) or the same as the ICMP Destination Address (when redirected to the on-link destination). ......

And the receive redirect function of ndisc_redirect_rcv() implemented this definition, checks the target address correctly. if (ipv6_addr_equal(dest, target)) { on_link = 1; } else if (!(ipv6_addr_type(target) & IPV6_ADDR_LINKLOCAL)) { ND_PRINTK2(KERN_WARNING "ICMPv6 Redirect: target address is not link-local.\n"); return; } So, I think the send redirect function must check the target address also. Signed-off-by: Li Yewang Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller

commit fa03ef38e1516c1f35f6a189100186dded0f8f8cAuthor: Neil Horman Date: Tue Jan 30 14:30:10 2007 -0800

[IPV6]: Fix up some CONFIG typos Signed-off-by: Neil Horman Signed-off-by: David S. Miller

commit adcb4711101dfef89d473f64a913089d303962aeAuthor: Patrick McHardy Date: Tue Jan 30 14:25:24 2007 -0800

[NETFILTER]: SIP conntrack: fix out of bounds memory access When checking for an @-sign in skp_epaddr_len, make sure not to run over the packet boundaries. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller

commit 7da5bfbb12e327b3a347ee3e076957cd6564eb56Author: Lars Immisch Date: Tue Jan 30 14:24:57 2007 -0800

[NETFILTER]: SIP conntrack: fix skipping over user info in SIP headers When trying to skip over the username in the Contact header, stop at the end of the line if no @ is found to avoid mangling following headers. We don't need to worry about continuation lines because we search inside a SIP URI. Fixes Netfilter Bugzilla #532. Signed-off-by: Lars Immisch Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller

commit fb74a8416022c033e1a950689c264c453f8f98d8Author: Patrick McHardy Date: Tue Jan 30 14:24:29 2007 -0800

[NETFILTER]: xt_connbytes: fix division by zero When the packet counter of a connection is zero a division by zero occurs in div64_64(). Fix that by using zero as average value, which is correct as long as the packet counter didn't overflow, at which point we have lost anyway. Additionally we're probably going to go back to 64 bit counters in 2.6.21. Based on patch from Jonas Berlin , with suggestions from KOVACS Krisztian . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller

commit 24a1dec55073000264f2da6278baef759929a14fAuthor: Randy Dunlap Date: Sun Jan 28 15:54:42 2007 -0800

[MAINTAINERS]: netfilter@ is subscribers-only netfilter mailing list is subscribers-only. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller

commit bcdddfb66cc998252d34758ce4109cedc0d24a5cAuthor: Linus Torvalds Date: Tue Jan 30 14:11:12 2007 -0800

Revert "net: ifb error path loop fix" This reverts commit 0c0b3ae68ec93b1db5c637d294647d1cca0df763. Quoth David: "Jeff, please revert It's wrong. We had a lengthy analysis of this piece of code several months ago, and it is correct. Consider, if we run the loop and we get an error the following happens: 1) attempt of ifb_init_one(i) fails, therefore we should not try to "ifb_free_one()" on "i" since it failed 2) the loop iteration first increments "i", then it check for error Therefore we must decrement "i" twice before the first free during the cleanup. One to "undo" the for() loop increment, and one to "skip" the ifb_init_one() case which failed." Reported-by: David Miller Acked-by: Jeff Garzik Cc: Andrew Morton Signed-off-by: Linus Torvalds

commit 0f2452855d86901ba3766826ccb5606ea4e15ab9

Author: Serge E. Hallyn Date: Tue Jan 30 15:28:23 2007 -0600

[PATCH] namespaces: fix task exit disaster This is based on a patch by Eric W. Biederman, who pointed out that pid namespaces are still fake, and we only have one ever active. So for the time being, we can modify any code which could access tsk->nsproxy->pid_ns during task exit to just use &init_pid_ns instead, and move the exit_task_namespaces call in do_exit() back above exit_notify(), so that an exiting nfs server has a valid tsk->sighand to work with. Long term, pulling pid_ns out of nsproxy might be the cleanest solution. Signed-off-by: Eric W. Biederman [ Eric's patch fixed to take care of free_pid() too ] Signed-off-by: Serge E. Hallyn Signed-off-by: Linus Torvalds

commit 444f378b237a0f728f5c4aba752c08d13c209344Author: Linus Torvalds Date: Tue Jan 30 13:35:18 2007 -0800

Revert "[PATCH] namespaces: fix exit race by splitting exit" This reverts commit 7a238fcba0629b6f2edbcd37458bae56fcf36be5 in preparation for a better and simpler fix proposed by Eric Biederman (and fixed up by Serge Hallyn) Acked-by: Serge E. Hallyn Signed-off-by: Linus Torvalds

commit b20c8453a7d6e8d63c0f05ba3e38d9428c8091b1Author: Al Viro Date: Tue Jan 30 13:23:40 2007 +0000

[PATCH] fix indentation-related breakage in Kconfig.i386 Kconfig recognizes the end of help text by receding indentation depth. Recent patch had broken HOST_VMSPLIT_... choice in arch/um/Kconfig.i386 - all alternatives are interpreted as part of help text now. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit 774ba59c950926abd27421fa146f1916de89e6f6Author: Al Viro Date: Tue Jan 30 13:23:50 2007 +0000

[PATCH] b44: src_desc->addr is little-endian Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit 6a13f66043cd755fc7e19f8e0fbb5bfcdf470e74Author: Al Viro Date: Tue Jan 30 13:24:00 2007 +0000

[PATCH] dma-mapping.h stubs fix do { } while(0) is not a good imitation of function returning void; use ((void)0) instead. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit d0a23398eeaa374eb0c0435c5a259ffde77c8af0Author: Al Viro Date: Tue Jan 30 13:23:55 2007 +0000

[PATCH] missing dma_sync_single_range_for{cpu,device} on alpha no-op as all dma_sync_... there. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit 161c888b0b4d28775dfe35274ee90c16a91b4365Author: Al Viro Date: Tue Jan 30 13:23:45 2007 +0000

[PATCH] pata_platform: fallout from set_mode() change Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit 9a696b4f3c5664c2c4815cc8e37256e51a3425e1Author: Al Viro Date: Tue Jan 30 13:23:35 2007 +0000

[PATCH] sym53c500_cs: remove bogus call fo free_dma() What DMA for 16bit pcmcia card, anyway? We never do request_dma() there and ->dma_channel never changes since initialization to -1. IOW, that call is dead code. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit a12743026ceb34388b9b983801ba99240cb0a199Author: Al Viro Date: Tue Jan 30 13:23:30 2007 +0000

[PATCH] mtd/nand/cafe.c missing include of dma-mapping.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit 89eb1693f975eddafd475782ee857d98f411d10dAuthor: Al Viro Date: Tue Jan 30 13:23:25 2007 +0000

[PATCH] missing exports of pm_power_off() on alpha and sparc32

Signed-off-by: Al Viro Signed-off-by: Linus Torvalds

commit 701dfbc1cbdd42b814dd76a885c4b73f97011d08Author: Hugh Dickins Date: Mon Jan 29 21:24:08 2007 +0000

[PATCH] mm: mremap correct rmap accounting Nick Piggin points out that page accounting on MIPS multiple ZERO_PAGEs is not maintained by its move_pte, and could lead to freeing a ZERO_PAGE. Instead of complicating that move_pte, just forget the minor optimization when mremapping, and change the one thing which needed it for correctness - filemap_xip use ZERO_PAGE(0) throughout instead of according to address. [ "There is no block device driver one could use for XIP on mips platforms" - Carsten Otte ] Signed-off-by: Hugh Dickins Cc: Nick Piggin Cc: Andrew Morton Cc: Ralf Baechle Cc: Carsten Otte Signed-off-by: Linus Torvalds

commit 8339f0008c47cdd921c73f6d53d5588b5484f93cAuthor: Eric W. Biederman Date: Mon Jan 29 13:19:05 2007 -0700

[PATCH] i386: In assign_irq_vector look at all vectors before giving up When the world was a simple and static place setting up irqs was easy. It sufficed to allocate a linux irq number and a find a free cpu vector we could receive that linux irq on. In those days it was a safe assumption that any allocated vector was actually in use so after one global pass through all of the vectors we would have none left. These days things are much more dynamic with interrupt controllers (in the form of MSI or MSI-X) appearing on plug in cards and linux irqs appearing and disappearing. As these irqs come and go vectors are allocated and freed, invalidating the ancient assumption that all allocated vectors stayed in use forever. So this patch modifies the vector allocator to walk through every possible vector before giving up, and to check to see if a vector is in use before assigning it. With these changes we stop leaking freed vectors and it becomes possible to allocate and free irq vectors all day long. This changed was modeled after the vector allocator on x86_64 where this limitation has already been removed. In essence we don't update the static variables that hold the position of the last vector we allocated until have successfully allocated another vector. This allows us to detect if we have completed one complete scan through all of the possible vectors.

Acked-by: Auke Kok Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds

commit 59df3230fc57fa8900bebf3d2d68221d549f3c7cAuthor: Geert Uytterhoeven Date: Mon Jan 29 13:47:01 2007 +0100

[PATCH] `make help' in build tree doesn't show headers_* targets `make help' in the build tree doesn't show the help texts about the `headers_install' and `headers_check' targets because it looks for include/asm-$(ARCH)/Kbuild in the wrong place. Add the missing `$(srctree)' prefixes to fix this. Also move the printing of the default install path for the headers inside the `if/fi', where it belongs. Signed-off-by: Geert Uytterhoeven Acked-by: Oleg Verych Signed-off-by: Linus Torvalds

commit 3d8b3036f5260b366ec0982aa2f862d841d058c2Author: Jan Engelhardt Date: Mon Jan 29 13:19:56 2007 -0800

[PATCH] cdev.h: forward declarations Apparently this broke due to missing `struct inode' declaration. Signed-off-by: Jan Engelhardt Cc: Noah Watkins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit efee2b812645d10824bf6cb247789910bcb66881Author: Evgeniy Dushistov Date: Mon Jan 29 13:19:56 2007 -0800

[PATCH] ufs: reallocation fix In blocks reallocation function sometimes does not update some of buffer_head::b_blocknr, which may and cause data damage. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 8682164a66325cab07620082eb7f413b547f4b4aAuthor: Evgeniy Dushistov Date: Mon Jan 29 13:19:55 2007 -0800

[PATCH] ufs: truncate negative to unsigned fix During ufs_trunc_direct which is subroutine of ufs::truncate, we try the first of all free parts of block and then whole blocks. But we calculate size of block's part to free in the wrong way.

This may cause bad update of used blocks and fragments statistic, and you can got report that you have free 32T on 1Gb partition. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit a685e26fff387db350966f88eaad515bf41c4705Author: Evgeniy Dushistov Date: Mon Jan 29 13:19:54 2007 -0800

[PATCH] ufs: alloc metadata null page fix These series of patches result of UFS1 write support stress testing, like running fsx-linux, untar and build linux kernel etc We pass from ufs::get_block_t to levels below: pointer to the current page, to make possible things like reallocation of blocks on the fly, and we also uses this pointer for indication, what actually we allocate data block or meta data block, but currently we make decision about what we allocate on the wrong level, this may and cause oops if we allocate blocks in some special order. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit ff79544754631cf3d237ff47b7d0e7ab2d211fcfAuthor: Miklos Szeredi Date: Mon Jan 29 13:19:54 2007 -0800

[PATCH] fuse: fix bug in control filesystem mount The BUG in fuse_ctl_add_dentry() could be triggered if the control filesystem was unmounted and mounted again while one or more fuse filesystems were present. The fix is to reset the dentry counter in fuse_ctl_kill_sb(). Bug reported by Florent Mertens. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 436d1654b341e55a73cada13cce3142b619f23bbAuthor: Mike Frysinger Date: Mon Jan 29 13:19:53 2007 -0800

[PATCH] use __u8 rather than u8 in userspace SIZE defines in hdreg.h Use __u8 rather than u8 in SIZE defines exported to userspace. Signed-off-by: Mike Frysinger Cc: Bartlomiej Zolnierkiewicz

Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 34e9a63b4f3e169b583f6ba2e26356ecbf932fbaAuthor: NeilBrown Date: Mon Jan 29 13:19:52 2007 -0800

[PATCH] knfsd: ratelimit some nfsd messages that are triggered by external events Also remove {NFSD,RPC}_PARANOIA as having the defines doesn't really add anything. The printks covered by RPC_PARANOIA were triggered by badly formatted packets and so should be ratelimited. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit d019bcf0eb9a55c51f1c57659f923d356b4675e1Author: Adrian Bunk Date: Mon Jan 29 13:19:51 2007 -0800

[PATCH] fs/lockd/clntlock.c: add missing newlines to dprintk's This patch adds missing newlines to dprintk's. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit a0f7b67ae470f3afed3f03d017fd1c29fd1b58b8Author: Andrew Morton Date: Mon Jan 29 13:19:50 2007 -0800

[PATCH] m68k: uaccess.h needs sched.h In file included from include/linux/crypto.h:26, from crypto/cipher.c:17: include/linux/uaccess.h: In function 'pagefault_disable': include/linux/uaccess.h:18: error: dereferencing pointer to incomplete type include/linux/uaccess.h: In function 'pagefault_enable': include/linux/uaccess.h:33: error: dereferencing pointer to incomplete type video_buf need PCI. Acked-by: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 49b14f24cc5aa962446515c9df501192eda99bd4Author: Robert P. J. Day Date: Mon Jan 29 13:19:50 2007 -0800

[PATCH] Fix "CONFIG_X86_64_" typo in drivers/kvm/svm.c

Fix what looks like an obvious typo in the file drivers/kvm/svm.c. Signed-off-by: Robert P. J. Day Acked-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 04611f98ce34f8911740ccd7e2bf0c22f818f622Author: Mike Frysinger Date: Mon Jan 29 13:19:49 2007 -0800

[PATCH] use __u8/__u32 in userspace ioctl defines for I2O Make sure exported I2O ioctls utilize userspace safe types. Signed-off-by: Mike Frysinger Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 88f6cd0c3bb5db2619103f834d4167b7d0d9899cAuthor: Johannes Stezenbach Date: Mon Jan 29 13:19:44 2007 -0800

[PATCH] uml: fix mknod Fix UML hostfs mknod(): userspace has differernt dev_t size and encoding than kernel, so extract major/minor and reencode using glibc makedev() macro. Signed-off-by: Johannes Stezenbach Acked-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 7a238fcba0629b6f2edbcd37458bae56fcf36be5Author: Serge E. Hallyn Date: Mon Jan 29 13:19:40 2007 -0800

[PATCH] namespaces: fix exit race by splitting exit Fix exit race by splitting the nsproxy putting into two pieces. First piece reduces the nsproxy refcount. If we dropped the last reference, then it puts the mnt_ns, and returns the nsproxy as a hint to the caller. Else it returns NULL. The second piece of exiting task namespaces sets tsk->nsproxy to NULL, and drops the references to other namespaces and frees the nsproxy only if an nsproxy was passed in. A little awkward and should probably be reworked, but hopefully it fixes the NFS oops. Signed-off-by: Serge E. Hallyn Cc: Herbert Poetzl Cc: Oleg Nesterov

Cc: "Eric W. Biederman" Cc: Cedric Le Goater Cc: Daniel Hokka Zakrisson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 90afd0e574a1a739aeb62e30d556ebf0289389e5Author: Dmitriy Monakhov Date: Sat Jan 27 00:00:03 2007 -0800

Broadcom 4400 resume small fix Some issues in b44_resume(). - Return value of pci_enable_device() was ignored. - If request_irq() has failed we have to just disable device and exit. Signed-off-by: Dmitriy Monakhov Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik

commit 00576e93805bd4f2dd2649e354726dee872d1e8aAuthor: Al Viro Date: Tue Jan 30 13:23:50 2007 +0000

b44: src_desc->addr is little-endian Signed-off-by: Al Viro Signed-off-by: Jeff Garzik

commit 518d83382568964ca9657511140398ebac925ecdAuthor: Auke Kok Date: Mon Jan 29 14:31:16 2007 -0800

e100: fix irq leak on suspend/resume e100: fix irq leak on suspend/resume From: Frederik Deweerdt The e100_resume() function should be calling netif_device_detach and free_irq. This fixes multiple irq's being allocated after resume. Signed-off-by: Frederik Deweerdt Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik

commit f8a8ccd56d82bd4f4b5c7c2e7eb758c7764d98e1Author: Andy Gospodarek Date: Mon Jan 29 12:08:38 2007 -0800

bonding: ARP monitoring broken on x86_64 While working with the latest bonding code I noticed a nasty problem that will prevent arp monitoring from always functioning correctly on x86_64 systems. Comparing ints to longs and expecting reliable results on x86_64 is a bad idea. With this patch, arp monitoring works correctly again.

Signed-off-by: Andy Gospodarek Cc: "David S. Miller" Cc: Stephen Hemminger Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik

commit d4150a2731615de5cd4527a23435aaa7396c63c6Author: Thomas Klein Date: Mon Jan 29 18:44:41 2007 +0100

ehea: Fixed missing tasklet_kill() call NEQ-Tasklet wasn't killed when module is removed. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik

commit 9c750b7d14301b710c13247f7cc28abd614d9f5cAuthor: Thomas Klein Date: Mon Jan 29 18:44:01 2007 +0100

ehea: Fixed wrong jumbo frames status query This patch fixes the wrong query and logging of the per interface jumbo frames enabled/disabled status. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik

commit 9e8e83d1ba0b248de34062a61f4f5d378a5dbd53Author: Andrew Morton Date: Sat Jan 27 00:00:04 2007 -0800

82596 warning fixes drivers/net/82596.c: In function 'i596_start_xmit': drivers/net/82596.c:1069: warning: cast from pointer to integer of different size drivers/net/82596.c: In function 'i82596_probe': drivers/net/82596.c:1249: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik

commit b1f54ba34f9e036ab515bbac0c01d17300e1c79aAuthor: Vitaly Bordug Date: Sat Jan 27 00:00:04 2007 -0800

FS_ENET: OF-related fixup for FEC and SCC MAC's Updated direct resource pass with ioremap call, make it grant proper IRQ mapping, stuff incompatible with the new approach were respectively put under #ifndef CONFIG_PPC_MERGE. It is required so that both ppc and powerpc could utilize fs_enet effectively. Signed-off-by: Vitaly Bordug

Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik

commit 0c0b3ae68ec93b1db5c637d294647d1cca0df763Author: Mariusz Kozlowski Date: Sat Jan 27 00:00:01 2007 -0800

net: ifb error path loop fix On error we should start freeing resources at [i-1] not [i-2]. Signed-off-by: Mariusz Kozlowski Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik

commit 5fc7d61aee1a7f7d3448f8fbccaa93371ebeecb0Author: Michael Chan Date: Fri Jan 26 23:59:57 2007 -0800

b44: Fix frequent link changes This fixes the issue of frequent link changes under heavy traffic reported below: http://bugzilla.kernel.org/show_bug.cgi?id=7696 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=216338 The b44 chip occasionally needs to be reset when ISTAT_ERRORS are encountered. The reset sequence includes a PHY reset that will take many seconds to complete and cause the link to go down and up. By skipping the PHY reset, it will greatly reduce the interruption when ISTAT_ERRORS are encountered. Change the full_reset parameter to reset_kind parameter in b44_init_hw(). This will allow PHY reset to be skipped when ISTAT_ERRORS are encountered. Signed-off-by: Michael Chan Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik

commit 78981a7c6c34bddbb90da72cf6ce10953e84aad8Author: Robert Hancock Date: Tue Jan 30 00:59:18 2007 -0800

libata: fix translation for START STOP UNIT libata's SCSI translation for the SCSI START STOP UNIT command with the START bit clear (i.e. stopping the drive) appears to be incorrect. It sends an ATA STANDBY command with the time period set to 0, which the code comment says means "now", but the ATA standard says this means disable the standby timer, which effectively does nothing. Change this to issue a STANDBY IMMEDIATE command which will actually spin the drive down. The

SAT (SCSI/ATA Translation) standard revision 9 concurs with this choice. Signed-off-by: Robert Hancock Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik

commit af068bd1debcc76c1bc265aa01401901bf0067edAuthor: David Milburn Date: Tue Jan 30 00:59:15 2007 -0800

libata-scsi: ata_task_ioctl should return ATA registers from sense data User applications using the HDIO_DRIVE_TASK ioctl through libata expect specific ATA registers to be returned to userspace. Verified that ata_task_ioctl correctly returns register values to the smartctl application. Signed-off-by: David Milburn Acked-by: Tejun Heo Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik

commit 2ca6611b1fc1f913f5370b3c50a0a35d817491b3Author: Andrew Morton Date: Tue Jan 30 00:59:14 2007 -0800

pata_platform: set_mode fix drivers/ata/pata_platform.c:85: warning: initialization from incompatible pointer type Cc: Jeff Garzik Cc: Tejun Heo Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik

commit 7a0f1c8a4b1052da7efc7715e2e557255b632712Author: Lennert Buytenhek Date: Mon Jan 29 13:28:47 2007 +0100

ata_if_xfermask() word 51 fix If word 53 bit 1 isn't set, the maximum PIO mode is indicated by the upper 8 bits of word 51, not the lower 8 bits. Fixes PIO mode detection on old Compact Flash cards. Signed-off-by: Lennert Buytenhek Signed-off-by: Jeff Garzik

commit 5dcade90db19205b9ebb8241a22664560973f81aAuthor: Sergei Shtylyov Date: Sun Jan 28 21:33:44 2007 +0300

pata_sil680: PIO1 taskfile transfers overclocking fix (repost) Fix PIO mode 1 overclocked taskfile transfers -- probably a typo carried over from drivers/ide/pci/siimage.c where I've found it by documentation

check... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik

commit 76398f9667e8369023ed5f4847fb59e9da8b6968Author: Jiri Kosina Date: Mon Jan 29 12:44:41 2007 +0100

HID: fix pb_fnmode and move it to generic HID The apple powerbook people are used to switch the pb_fnmode setting at runtime through writing to sysfs, altering the module parameter value. This was broken for them in 2.6.20-rc1 when generic HID layer was introduced, as the pb_fnmode flag was made per-hiddevice, instead of global variable. This patch moves the pb_fnmode module parameter from usbhid module to hid module, but apart from that retains backward compatibility with respect to changing the mode through sysfs. Signed-off-by: Jiri Kosina

commit 9616d54fffa4c9ae78136cc6d01209de2d92b75dAuthor: Robert P. J. Day Date: Thu Jan 25 18:41:35 2007 -0500

[MIPS] Fix typo of "CONFIG_MT_SMP". Signed-off-by: Robert P. J. Day Signed-off-by: Ralf Baechle

commit 1ca5cb5ddd500fdf2096ebe9d4131ee9f1eabf43Author: Ralf Baechle Date: Thu Jan 25 23:55:17 2007 +0000

[MIPS] Ocelot G: Fix a few misspellings of CONFIG_GALILEO_GT64240_ETH Reported by Robert P. J. Day . Signed-off-by: Ralf Baechle

commit bf2326e7525404576ab2bdf890e903ca4a249093Author: Jan Altenberg Date: Thu Jan 25 16:25:56 2007 +0100

[PATCH] Malta: Fix build if CONFIG_MTD is diabled. Signed-off-by: Jan Altenberg Signed-off-by: Ralf Baechle

commit c0d4d573feed199b16094c072e7cb07afb01c598Author: Mike Christie Date: Mon Jan 29 21:18:38 2007 -0500

[PATCH] Fix SG_IO timeout jiffy conversion Commit 85e04e371b5a321b5df2bc3f8e0099a64fb087d7 cleaned up the timeout conversion, but did it exactly the wrong way. We get msecs from user space, and should convert them into jiffies. Not the other way around.

Here is a fix with the overflow check sg.c has added in. This fixes DVD burnign with Nero. Signed-off-by: Mike Christie [ "you'll be wanting a comma there" - Andrew ] Cc: Andrew Morton Signed-off-by: Linus Torvalds

commit 87df7241bd547da5d4d4a4e5397866dfe422e439Author: Nick Piggin Date: Tue Jan 30 14:36:27 2007 +1100

[PATCH] Fix try_to_free_buffer() locking Fix commit ecdfc9787fe527491baefc22dce8b2dbd5b2908d Not to put too fine a point on it, but in a nutshell... __set_page_dirty_buffers() | try_to_free_buffers() ---------------------------+--------------------------- | spin_lock(private_lock); | drop_bufers() | spin_unlock(private_lock); spin_lock(private_lock) | !page_has_buffers() | spin_unlock(private_lock) | SetPageDirty() | | cancel_dirty_page() oops! Signed-off-by: Nick Piggin Acked-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 4cbf2aa35e1c189db234190fefc6c83b139ef963Author: Stephen Hemminger Date: Mon Jan 29 16:38:07 2007 -0800

[PATCH] sky2: revert IRQ dance on suspend/resume Let's just backout the IRQ hack, and for those crap machines (like some Sony VAIO's) can just disable MSI with the module parameter. This reverts 44ade178249fe53d055fd92113eaa271e06acddd. Signed-off-by: Stephen Hemminger Cc: Jeff Garzik Cc: Thomas Gleixner Cc: Frédéric Riss Signed-off-by: Linus Torvalds

commit dc6e29da9162fa8fa2a9e798569c0f6e87975614Author: Linus Torvalds Date: Mon Jan 29 16:37:38 2007 -0800

Fix balance_dirty_page() calculations with CONFIG_HIGHMEM This makes balance_dirty_page() always base its calculations on the amount of non-highmem memory in the machine, rather than try to base it

on total memory and then falling back on non-highmem memory if the mapping it was writing wasn't highmem capable. This not only fixes a situation where two different writers can have wildly different notions about what is a "balanced" dirty state, but it also means that people with highmem machines don't run into an OOM situation when regular memory fills up with dirty pages. We used to try to handle the latter case by scaling down the dirty_ratio if the machine had a lot of highmem pages in page_writeback_init(), but it wasn't aggressive enough for some situations, and since basing the dirty ratio on highmem memory was broken in the first place, let's just stop doing so. (A variation of this theme fixed Justin Piszcz's OOM problem when copying an 18GB file on a RAID setup). Acked-by: Nick Piggin Cc: Justin Piszcz Cc: Andrew Morton Cc: Neil Brown Cc: Ingo Molnar Cc: Randy Dunlap Cc: Christoph Lameter Cc: Jens Axboe Cc: Peter Zijlstra Cc: Adrian Bunk Signed-off-by: Linus Torvalds

commit 7d2aae1e88660cf09be913e9754e45189dc33412Author: Takashi Iwai Date: Fri Jan 26 12:40:31 2007 +0100

[PATCH] ALSA: Fix sysfs breakage The recent change for a new sysfs tree with card* object breaks the /sys/class/sound tree if CONFIG_SYSFS_DEPRECATED is enabled. The device in each entry doesn't point the correct device object: /sys/class/sound ... |-- pcmC0D0c | |-- dev | |-- device -> ../../../class/sound/card0 | |-- pcm_class | |-- power | | `-- wakeup | |-- subsystem -> ../../../class/sound | `-- uevent Also, this change breaks some drivers (like sound/arm/*) referring card->dev directly to obtain the device object for memory handling. This patch reverts the semantics of card->dev to the former version, which points to a real device object. The card* object is stored in a new card->card_dev field, instead. The device parent is chosen either card->dev or card->card_dev according to CONFIG_SYSFS_DEPRECATED to keep the tree compatibility. Also, card* isn't created if CONFIG_SYSFS_DEPRECATED is enabled. The reason of card* object is a root of all beloing devices, and it makes

little sense if each sound device points to the real device object directly. Signed-off-by: Takashi Iwai Acked-by: Monty Montgomery Signed-off-by: Greg Kroah-Hartman

commit b9d1902cd281d9b829fb3d6ee9148d28c8c63382Author: Ben Dooks Date: Mon Jan 29 00:11:29 2007 +0100

[ARM] 4117/1: S3C2412: Fix writel() usage in selection code The S3C2412 DMA selection code has the arguments to writel() the wrong way around. Signed-off-by: Ben Dooks Signed-off-by: Russell King

commit 3453c8478a228d9b374956ea99256163f1a0c88cAuthor: Dave Jones Date: Mon Jan 29 00:07:04 2007 -0500

[CPUFREQ] Remove unneeded errata workaround from p4-clockmod. This workaround unnecessarily cripples functionality to work around an errata that doesn't seem possible to hit due to us using the automatic clock throttling in the p4 mcheck code. See http://lkml.org/lkml/2006/10/28/148 for complete reasoning and lack of disconsent. Signed-off-by: Dave Jones

commit 0142f9dce8425da031d72dc3b70ee7161fcaaea2Author: Ahmed S. Darwish Date: Fri Jan 5 05:44:54 2007 +0200

[CPUFREQ] check sysfs_create_link return value Trivial patch to check sysfs_create_link return values. Fail gracefully if needed. Signed-off-by: Ahmed Darwish Signed-off-by: Dave Jones

commit 43ed41f648554c9fecaf7597d25e05da63ec7290Author: Dave Jones Date: Sun Jan 28 17:58:33 2007 -0500

[AGPGART] Add new IDs to VIA AGP. Culled from the VIA codedrop. Also fixes up one ID used in amd64-agp to use the VIA part number instead of the board name in its ID. Signed-off-by: Dave Jones

commit 7707ea3b784195315366e6e4b5c73ca6933ff9b0Author: Dave Jones Date: Sun Jan 28 17:50:17 2007 -0500

[AGPGART] Remove pointless assignment. No point in clearing local pointers then returning. Also fix up some CodingStyle nits. Signed-off-by: Dave Jones

commit 87a17f31a3bc9bf0c7e7493add19ef200e741248Author: Dave Jones Date: Sun Jan 28 17:41:37 2007 -0500

[AGPGART] Remove pointless typedef in ati-agp This seems to exist just to save people typing 'struct' a few times, and doesn't provide any additional value. Signed-off-by: Dave Jones

commit c30efbaeaa9297fb1a35ef952350e0c2bb7a3d47Author: Dave Jones Date: Sun Jan 28 17:39:19 2007 -0500

[AGPGART] Prevent (unlikely) memory leak in amd_create_gatt_pages() If we fail an alloc, unwind the previous allocs that succeeded. Spotted-by: Alan Grimes Signed-off-by: Dave Jones

commit 545da94f924d52f80e2bbea99a8652f454889a2bAuthor: Benjamin Herrenschmidt Date: Sun Jan 28 07:45:53 2007 +1100

[POWERPC] Fix sys_pciconfig_iobase bus matching A stupid bug has been plaguing the sys_pciconfig_iobase on ppc64. It wasn't noticed until recently as it seems to not affect G5s but it's been causing problems running X servers on some other machines recently. The bus number matching was bogus. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras

commit 05916eec9f4d4370ef9a6cbb699f637302f6e157Author: Geoff Levand Date: Thu Jan 25 18:07:14 2007 -0800

[POWERPC] PS3: add not complete comment to kconfig Add a comment to the PS3 config option to inform users that the current implementation is not yet complete. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras

commit 91614c054c9ffc26b47a5cb3135113aa0f6e6ff0Author: Kai Makisara

Date: Fri Jan 26 00:38:39 2007 +0200

[SCSI] st: A MTIOCTOP/MTWEOF within the early warning will cause the file number to be incorrect On Wed, 24 Jan 2007, Andrew Morton wrote: > On Mon, 22 Jan 2007 13:07:20 -0800 > bugme-daemon@bugzilla.kernel.org wrote: > > > http://bugzilla.kernel.org/show_bug.cgi?id=7864 > > > > Summary: A MTIOCTOP/MTWEOF within the early warning will cause > > the file number to be incorrect > > Kernel Version: 2.6.19.2 > > Status: NEW > > Severity: low > > Owner: io_scsi@kernel-bugs.osdl.org > > Submitter: ce_reisinger@yahoo.com > > > > > > Write records to a SCSI tape until a write fails with a ENOSPC (you have reached > > early warning. > > Now perform a: > > struct mtget before, after; > > ioctl(fd, MTIOCGET, &before); > > struct mtop mtop = { MTWEOF, 1 }; > > ioctl(fd, MTIOCTOP, &mtop); > > ioctl(fd, MTIOCGET, &after); > > > > Check the value of mt_fileno in the before and after structures. Notice the > > after is 2 greater then the before. > > > > The problem appears to be in the block of code starting at line 2817 in st.c. > > This block is entered because the drive did return a CHECK CONDITION with NO > > SENSE and the SENSE_EOM bit set. At lines 2824/5 the fileno is incremented. But > > it has already been increased by the number of filemarks requested by the > > MTIOCTOP. I believe that the residue count in the sense data should be > > subtracted from fileno, not a increment as is done. > > > > Thanks. Could you please send us a tested patch to fix these things, as > per http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt ? > The analysis is basically correct and explains the bug. According to the SCSI standards, the sense code is NO SENSE or RECOVERED ERROR in case writing filemark(s) succeeds. If it fails (partly or completely) the sense code is VOLUME OVERFLOW. The patch below is tested to fix the case when one filemark is successfully written after the EOM early warning. It should also fix the case at real EOM but this has not been tested.

Carl, thanks for reporting the bug and providing the analysis for the fix. Signed-off-by: Kai Makisara Signed-off-by: James Bottomley

commit 477ffb9d8732f30e7ab2d20f6ed0c22bad37a4a5Author: David C Somayajulu Date: Mon Jan 22 12:26:11 2007 -0800

[SCSI] qla4xxx: bug fixes The included patch fixes the following issues: 1. qla3xxx/qla4xxx co-existence issue which can result in a lockup when qla3xxx driver is unloaded, or when ifdown; ifup is performed on one of the interfaces correponding to qla3xxx. This is because qla4xxx HBA supports one ethernet and iscsi interfaces per port. Both iscsi and ethernet interfaces share the same state machine. The problem has to do with synchronizing access to the state machine in the event of a reset 2. mutex_lock() is sometimes not followed by mutex_unlock() prior to invoking a msleep() in qla4xxx_mailbox_command() Signed-off-by: James Bottomley

commit 938e2ac0b7ac72d264783b0b548eb6078c295294Author: Matthew Wilcox Date: Mon Jan 15 18:07:09 2007 -0700

[SCSI] Fix scsi_add_device() for async scanning I had thought that all drivers which didn't call scsi_scan_host() called scsi_scan_target(). Some, such as sbp2, mptsas and libata-scsi, call scsi_add_device() or __scsi_add_device(). We just need to wait for the currently executing async scans to complete first. This is the same code that's in scsi_scan_target(), except that we have to return an error instead of void when we're declining to scan at all. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley

commit e0b874df14052489e6408125903dba96b4dd7baaAuthor: Josepch Chan Date: Sat Jan 27 13:47:08 2007 +0100

via82cxxx/pata_via: correct PCI_DEVICE_ID_VIA_SATA_EIDE ID and add support for CX700 and 8237S This patch: * Corrects the wrong device ID of PCI_DEVICE_ID_VIA_SATA_EIDE from 0x0581 to 0x5324. * Adds VIA CX700 and VT8237S support in drivers/ide/pci/via82cxxx.c * Adds VIA VT8237S support in drivers/ata/pata_via.c Signed-off-by: Josepch Chan Signed-off-by: Bartlomiej Zolnierkiewicz

commit 6855036aa035913bc2bfb31c41576a49f42ecd5f

Author: Tejun Heo Date: Sat Jan 27 13:47:02 2007 +0100

ide: unregister idepnp driver on unload idepnp driver is registered as a pnp driver on ide init but doesn't get unregistered on ide unload causing driver list corruption and eventually oops. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Bartlomiej Zolnierkiewicz

commit 82ab1eeceba6705cd5a8815c48eb03af1dada744Author: Bartlomiej Zolnierkiewicz Date: Sat Jan 27 13:46:56 2007 +0100

ide: add missing __init tags to IDE PCI host drivers also change __devinit tag for sgiioc4.c:ioc4_ide_init() to __init Signed-off-by: Bartlomiej Zolnierkiewicz

commit 677c0a78f6bf7aa87c90c4e015e014a17132c634Author: Bartlomiej Zolnierkiewicz Date: Sat Jan 27 13:46:54 2007 +0100

ia64: add pci_get_legacy_ide_irq() Add pci_get_legacy_ide_irq() identical to the one used by i386/x86_64. Fixes amd74xx driver build on ia64 (bugzilla bug #6644). Signed-off-by: Bartlomiej Zolnierkiewicz

commit 3e9e4c8606127592cda22159cc2440ea48963ae4Author: Alan Cox Date: Sat Jan 27 13:46:45 2007 +0100

ide/generic: Jmicron has its own drivers now Drop ide-generic support for Jmicron identifiers as we now trust Jmicron.c for this with drivers/ide. The code check remains for the all-generic-ide case. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz

commit e5c073ff24604d4dbb2fbcedb17da6df768468d3Author: Conke Hu Date: Sat Jan 27 13:46:40 2007 +0100

atiixp.c: add cable detection support for ATI IDE IDE HDD does not work if it uses a 40-pin PATA cable on ATI chipset. This patch fixes the bug. Signed-off-by: Conke Hu Cc: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton

Signed-off-by: Bartlomiej Zolnierkiewicz

commit b25168dfdc162b4198fa6395cd191a20dddc6d34Author: Conke Hu Date: Sat Jan 27 13:46:30 2007 +0100

atiixp.c: sb600 ide only has one channel AMD/ATI SB600 IDE/PATA controller only has one channel. Signed-off-by: Conke Hu Cc: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz

commit 737153298023342073ccaa006144dd254b298e2bAuthor: Conke Hu Date: Sat Jan 27 13:46:28 2007 +0100

atiixp.c: remove unused code A previous patch to atiixp.c was removed but some code has not been cleaned. Now we remove these code sine they are no use any longer. Signed-off-by: Conke Hu Cc: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz

commit a51545ab2523b9cfd426737495f877821006371aAuthor: Andrew Morton Date: Sat Jan 27 13:46:21 2007 +0100

jmicron: fix warning Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz

commit 1e7106fc7ea6af9c365afe2bfcde57cb1fdd1093Author: Bartlomiej Zolnierkiewicz Date: Sat Jan 27 13:46:14 2007 +0100

ide: update MAINTAINERS entry Signed-off-by: Bartlomiej Zolnierkiewicz

commit 03ee5b1cdd09ed1ee2e75d0bc647fc5db66b9d07Author: Tejun Heo Date: Fri Jan 26 20:10:25 2007 +0900

libata: fix ata_eh_suspend() return value ata_eh_suspend() was returning 0 regardless of failure. This bug has potential to lose data on suspend. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik

commit a718728f9e40ec79c0879ec6509a54fee214f5b2

Author: Tejun Heo Date: Sat Jan 27 11:04:26 2007 +0900

ahci: port_no should be used when clearing IRQ in ahci_thaw() ap->id is logcial port ID which is unique among all ATA ports and doesn't have anything to do with hardware port index. ap->port_no is the hardware port index and thus should be used when clearing IRQ mask in ahci_thaw(). This problem has been spotted by Jeff Garzik . Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik

commit 095b8501e4168ae5a879fcb9420ac48cbd43f95aAuthor: Robert Olsson Date: Fri Jan 26 19:06:01 2007 -0800

[IPV4]: Fix single-entry /proc/net/fib_trie output. When main table is just a single leaf this gets printed as belonging to the local table in /proc/net/fib_trie. A fix is below. Signed-off-by: Robert Olsson Acked-by: Eric W. Biederman Signed-off-by: David S. Miller

commit 342a0cff0ad5fba6b591cfa37db3c65c4d9913f8Author: Venkat Yekkirala Date: Fri Jan 26 19:03:48 2007 -0800

[SELINUX]: Fix 2.6.20-rc6 build when no xfrm This patch is an incremental fix to the flow_cache_genid patch for selinux that breaks the build of 2.6.20-rc6 when xfrm is not configured. Signed-off-by: Venkat Yekkirala Signed-off-by: David S. Miller

commit 86d43258bcad2068744c85181b97bb35ab27a74dAuthor: David S. Miller Date: Fri Jan 26 18:48:16 2007 -0800

[SPARC64]: Set g4/g5 properly in sun4v dtlb-prot handling. Mirror the logic in the sun4u handler, we have to update both registers even when we branch out to window fault fixup handling. The way it works is that if we are in etrap processing a fault already, g4/g5 holds the original fault information. If we take a window spill fault while doing etrap, then we put the window spill fault info into g4/g5 and this is what the top-level fault handler ends up processing first. Then we retry the originally faulting instruction, and process the original fault at that time.

This is all necessary because of how constrained the trap registers are in these code paths. These cases trigger very rarely, so even if there is some performance implication it's doesn't happen very often. In fact the rarity is why it took so long to trigger and find this particular bug. Signed-off-by: David S. Miller

commit c229ec5dae58b218cab0bc1b36a7647b0ec4900fAuthor: H. Peter Anvin Date: Fri Jan 26 09:15:47 2007 -0800

[PATCH] Boot loader ID for Gujin Add an official boot loader ID for Gujin. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds

commit a8a75a20e9a854685ac3e7af2e0e32f9b0be436bAuthor: Mark Fasheh Date: Fri Jan 26 10:46:59 2007 -0800

[PATCH] ocfs2: fix thinko in ocfs2_backup_super_blkno() Fix a bug which was introduced when I synced up ocfs2_fs.h with ocfs2-tools. We can't do u64/u32 in kernel. Signed-off-by: Mark Fasheh Signed-off-by: Linus Torvalds

commit 8cdf92a98fa0f91068615443f2a8597b7f2c34caAuthor: David Woodhouse Date: Mon Jan 1 19:31:15 2007 +0000

Fix Maple PATA IRQ assignment. On the Maple board, the AMD8111 IDE is in legacy mode... except that it appears on IRQ 20 instead of IRQ 15. For drivers/ide this was handled by the architecture's "pci_get_legacy_ide_irq()" function, but in libata we just hard-code the numbers 14 and 15. This patch provides asm-powerpc/libata-portmap.h which maps the IRQ as appropriate, having added a pci_dev argument to the ATA_{PRIM,SECOND}ARY_IRQ macros. There's probably a better way to do this -- especially if we observe that the _only_ case in which this seemingly-generic "pci_get_legacy_ide_irq()" function returns anything other than 14 and 15 for primary and secondary respectively is the case of the AMD8111 on the Maple board -- couldn't we handle that with a special case in the pata_amd driver, or perhaps with a PCI quirk for Maple to switch it into native mode during early boot and assign resources properly? Signed-off-by: David Woodhouse Signed-off-by: Jeff Garzik

commit dfd7a3db3898e299bdc25f0c77081a8632b3a73cAuthor: Tejun Heo Date: Fri Jan 26 15:37:20 2007 +0900

ahci: use 0x80 as wait stat value instead of 0xff Before hardreset, ahci initialized stat part of received FIS area to 0xff to wait for the first D2H Reg FIS which would change the value to device ready state. This used to work but now libata considers status value of 0xff as device not present making this wait prone to failure. This patch makes ahci use 0x80 for the wait stat value instead of 0xff to fix the above problem. Signed-off-by: Tejun Heo drivers/ata/ahci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik

commit d02598721706ab62a574823479b1f6c26c8980d2Author: Tejun Heo Date: Fri Jan 26 14:57:31 2007 +0900

sata_via: style clean up, no indirect method call in LLD Call ata_bmdma_irq_clear() directly instead of through ap->ops->irq_clear() according to libata style guideline. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik

commit 6096b63e2584796341baf7e7735f98d387f489f2Author: Tejun Heo Date: Fri Jan 26 14:47:38 2007 +0900

ahci: fix endianness in spurious interrupt message Fix endianness in spurious interrupt message. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik

commit 496a0fc8c5572a626de41d56d7c7ed005a2c1b48Author: Matt Domsch Date: Fri Jan 26 00:57:18 2007 -0800

[PATCH] Fix race in efi variable delete code Fix race when deleting an EFI variable and issuing another EFI command on the same variable. The removal of the variable from the efivars_list should be done in efivar_delete and not delayed until the kobject release. Furthermore, remove the item from the list at module unload time, and use list_for_each_entry_safe() rather than list_for_each_safe() for readability. Tested on ia64.

Signed-off-by: Prarit Bhargava Signed-off-by: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 01f2073411e01777e3c6f45a4bf05ea76493f326Author: Francois Romieu Date: Fri Jan 26 00:57:17 2007 -0800

[PATCH] netdev: add a MAINTAINERS entry for via-velocity and update my address Signed-off-by: Francois Romieu Cc: "David S. Miller" Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 1fb844961818ce94e782acf6a96b92dc2303553bAuthor: Alexey Dobriyan Date: Fri Jan 26 00:57:16 2007 -0800

[PATCH] core-dumping unreadable binaries via PT_INTERP Proposed patch to fix #5 in http://www.isec.pl/vulnerabilities/isec-0017-binfmt_elf.txt aka http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2004-1073 To reproduce, do * grab poc at the end of advisory. * add line "eph.p_memsz = 4096;" after "eph.p_filesz = 4096;" where first "4096" is something equal to or greater than 4096. * ./poc /usr/bin/sudo && ls -l Here I get with 2.6.20-rc5: -rw------- 1 ad ad 102400 2007-01-15 19:17 core ---s--x--x 2 root root 101820 2007-01-15 19:15 /usr/bin/sudo Check for MAY_READ like binfmt_misc.c does. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit c20086de9319ac406f1e96ad459763c9f9965b18Author: NeilBrown Date: Fri Jan 26 00:57:14 2007 -0800

[PATCH] md: remove unnecessary printk when raid5 gets an unaligned read. raid5_mergeable_bvec tries to ensure that raid5 never sees a read request that does not fit within just one chunk. However as we must always accept a single-page read, that is not always possible. So when "in_chunk_boundary" fails, it might be unusual, but it is not a

problem and printing a message every time is a bad idea. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit fe33f6f1525113ab0bae416966209438e7a31987Author: Jeff Dike Date: Fri Jan 26 00:57:12 2007 -0800

[PATCH] Fix UML on non-standard VM split hosts This fixes UML on hosts with non-standard VM splits. We had changed the config variable that controls UML behavior on such hosts, but not propogated the change everywhere. In particular, the values of STUB_CODE and STUB_DATA relied on the old variable. I also reformatted the HOST_VMSPLIT_3G help to make it more standard. Spotted by uml@flonatel.org. Signed-off-by: Jeff Dike Cc: Blaisorblade Cc: Pravin Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 569d3287c1f2c5d5e9264e89bd2c0f632e7b7dbbAuthor: Trond Myklebust Date: Fri Jan 26 00:57:11 2007 -0800

[PATCH] MM: Remove [PATCH] invalidate_inode_pages2_range() debug NFS can handle the case where invalidate_inode_pages2_range() fails, so the premise behind commit 8258d4a574d3a8c01f0ef68aa26b969398a0e140 is now gone. Remove the WARN_ON_ONCE() which is causing users grief as we can see from http://bugzilla.kernel.org/show_bug.cgi?id=7826 Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 2a2275d630b982e5f90206f9bc497f6695a3ec5dAuthor: NeilBrown Date: Fri Jan 26 00:57:11 2007 -0800

[PATCH] md: fix potential memalloc deadlock in md If a GFP_KERNEL allocation is attempted in md while the mddev_lock is held, it is possible for a deadlock to eventuate. This happens if the array was marked 'clean', and the memalloc triggers

a write-out to the md device. For the writeout to succeed, the array must be marked 'dirty', and that requires getting the mddev_lock. So, before attempting a GFP_KERNEL allocation while holding the lock, make sure the array is marked 'dirty' (unless it is currently read-only). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit a0ad13ef643a5829d63c456ab6143bbda60b44a9Author: NeilBrown Date: Fri Jan 26 00:57:10 2007 -0800

[PATCH] knfsd: Fix type mismatch with filldir_t used by nfsd nfsd defines a type 'encode_dent_fn' which is much like 'filldir_t' except that the first pointer is 'struct readdir_cd *' rather than 'void *'. It then casts encode_dent_fn points to 'filldir_t' as needed. This hides any other type mismatches between the two such as the fact that the 'ino' arg recently changed from ino_t to u64. So: get rid of 'encode_dent_fn', get rid of the cast of the function type, change the first arg of various functions from 'struct readdir_cd *' to 'void *', and live with the fact that we have a little less type checking on the calling of these functions now. Less internal (to nfsd) checking offset by more external checking, which is more important. Thanks to Gabriel Paubert for discovering this and providing an initial patch. Signed-off-by: Gabriel Paubert Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit 45f8bde0d0d6deb168b45998c72b4fbeb2f57efbAuthor: Robert P. J. Day Date: Fri Jan 26 00:57:09 2007 -0800

[PATCH] fix various kernel-doc in header files Fix a number of kernel-doc entries for header files in include/linux by making sure they begin with the appropriate '/**' notation and use @var notation. Signed-off-by: Robert P. J. Day Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit a8d814b5dd7a1bc5c19ae32d35b8bd4d8a510eaeAuthor: Mike Frysinger Date: Fri Jan 26 00:57:08 2007 -0800

[PATCH] remove __devinit markings from rtc_sysfs_add_device() rtc_sysfs_add_device is needed even after dev initialization, so drop __devinit. Signed-off-by: Mike Frysinger Acked-by: Alessandro Zummo Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

commit bfa152fa5e4d328fe3ebf15908ee8ec20a0ce6dcAuthor: Jun'ichi Nomura Date: Fri Jan 26 00:57:07 2007 -0800

[PATCH] dm-multipath: fix stall on noflush suspend/resume Allow no