commit b6ff50833ad43a8ebd9b16bf53c334f7aaf33c41 Author: Linus Torvalds Date: Sat Jul 29 23:15:36 2006 -0700 Linux v2.6.18-rc3 commit b83a8e64fd1aecf021111d22c062c97a3241d0c4 Author: Andi Kleen Date: Sat Jul 29 21:42:55 2006 +0200 [PATCH] MM: Remove rogue readahead printk For some reason it triggers always with NFS root and spams the kernel logs of my nfs root boxes a lot. Signed-off-by: Andi Kleen Acked-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 70583161e878c8e9baaace71ba000b46c86b89cc Author: Andi Kleen Date: Sat Jul 29 21:42:52 2006 +0200 [PATCH] i386: Fix up backtrace fallback patch I didn't test all compilation combinations. Shame on me. And fix a missing option in the boot option following x86-64 (Jan Beulich) Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 65f87d8a8a6e1b560c61951d0a68ed80f7c8ff19 Author: Andi Kleen Date: Sat Jul 29 21:42:49 2006 +0200 [PATCH] x86_64: Fix swiotlb=force It was broken before. But having it is important as possible hardware bug workaround. And previously there was no way to force swiotlb if there is another IOMMU. Side effect is that iommu=force won't force swiotlb anymore even if there isn't another IOMMU. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 355540f3338e1408dac98413f05d612a76d4f5e3 Author: Andi Kleen Date: Sat Jul 29 21:42:46 2006 +0200 [PATCH] x86_64: Revert k8-bus.c northbridge access change As Travis Betak points out it accesses the wrong northbridge subfunction now. Switch back to the old code. Cc: "Travis Betak" Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d2105b10fe0f460c388fe4e09226313f519d8c00 Author: Jon Mason Date: Sat Jul 29 21:42:43 2006 +0200 [PATCH] x86_64: Calgary IOMMU - Multi-Node NULL pointer dereference fix Calgary hits a NULL pointer dereference when booting in a multi-chassis NUMA system. See Redhat bugzilla number 198498, found by Konrad Rzeszutek (konradr@redhat.com). There are many issues that had to be resolved to fix this problem. Firstly when I originally wrote the code to handle NUMA systems, I had a large misunderstanding that was not corrected until now. That was that I thought the "number of nodes online" referred to number of physical systems connected. So that if NUMA was disabled, there would only be 1 node and it would only show that node's PCI bus. In reality if NUMA is disabled, the system displays all of the connected chassis as one node but is only ignorant of the delays in accessing main memory. Therefore, references to num_online_nodes() and MAX_NUMNODES are incorrect and need to be set to the maximum number of nodes that can be accessed (which are 8). I created a variable, MAX_NUM_CHASSIS, and set it to 8 to fix this. Secondly, when walking the PCI in detect_calgary, the code only checked the first "slot" when looking to see if a device is present. This will work for most cases, but unfortunately it isn't always the case. In the NUMA MXE drawers, there are USB devices present on the 3rd slot (with slot 1 being empty). So, to work around this, all slots (up to 8) are scanned to see if there are any devices present. Lastly, the bus is being enumerated on large systems in a different way the we originally thought. This throws the ugly logic we had out the window. To more elegantly handle this, I reorganized the kva array to be sparse (which removed the need to have any bus number to kva slot logic in tce.c) and created a secondary space array to contain the bus number to phb mapping. With these changes Calgary boots on an x460 with 4 nodes with and without NUMA enabled. Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 089bbbcb36979166131868a89ca5f4e695d6637d Author: Muli Ben-Yehuda Date: Sat Jul 29 21:42:40 2006 +0200 [PATCH] x86_64: Calgary IOMMU - fix off by one error Fixed off-by-one error in detect_calgary and calgary_init which will cause arrays to overflow. Also, removed impossible to hit BUG_ON. Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0e5f61b00c577da698fb00cd9c91a96b79044dfd Author: Andi Kleen Date: Sat Jul 29 21:42:37 2006 +0200 [PATCH] x86_64: On Intel systems when CPU has C3 don't use TSC On Intel systems generally the TSC stops in C3 or deeper, so don't use it there. Follows similar logic on i386. This should fix problems on Meroms. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 260f659b232b17889e3f0c9bf411675898b222c2 Author: Andi Kleen Date: Sat Jul 29 21:42:34 2006 +0200 [PATCH] x86_64: Update defconfig Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ceaccbd2a6a82b97bd15938fc7ffe180754cbe6c Author: Catalin Marinas Date: Sat Jul 29 08:29:30 2006 +0100 [ARM] 3734/1: Fix the unused variable warning in __iounmap() Patch from Catalin Marinas This patch adds #ifdef around some variables in the arch/arm/mm/ioremap.c file. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 7b1df1985c7a4e6d5fcab0ed71a2cd1d4ad3be41 Author: George G. Davis Date: Sat Jul 29 08:29:27 2006 +0100 [ARM] 3737/1: Export ARM copy/clear_user_page symbols Patch from George G. Davis As reported by various folks on the ARM Linux kernel mailing list, the video-buf.ko driver has undefined references on all ARM machines which use it as observed during `make modules`: Warning: "v4wb_clear_user_page" [drivers/media/video/video-buf.ko] undefined! Similar warnings exist for all ARM machines which use this driver. So this change adds the missing EXPORT_SYMBOLs to allow using this driver as a module. Signed-off-by: George G. Davis Signed-off-by: Russell King commit a6a38a66224c7c578cfed2f584b440c81af0c3ae Author: Lennert Buytenhek Date: Sat Jul 29 08:29:26 2006 +0100 [ARM] 3736/1: xscale: don't mis-report 80219 as an iop32x Patch from Lennert Buytenhek The IOP 80219 xscale CPU is a stripped down version of the IOP32x. But the fact that the 80219 and IOP32x are very similar doesn't mean that they need to share a cpu table entry. It's also somewhat confusing for the end user to see the 80219 reported as an IOP32x, so this patch splits the IOP32x cpu table entry to make a separate entry for the 80219. Signed-off-by: Lennert Buytenhek Signed-off-by: Dan Williams Signed-off-by: Russell King commit 187ff3b8575569668cde9021b9fe70386a4131fb Author: Stephen Hemminger Date: Wed Jul 19 14:08:42 2006 -0700 [PATCH] skge: chip clock rate typo Okay, Fix both typo's in one patch .The impact is that the incorrect value was being computed for blinking LED and interrupt moderation values. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 9a71db721a2cbb9921b929b2699ab181f5a3c6c0 Author: Brice Goglin Date: Fri Jul 21 15:49:32 2006 -0400 [PATCH] myri10ge - Always do a dummy RDMA after loading the firmware Always do a dummy RDMA after loading the firmware to work around buggy PCIe chipsets which do not implement resending properly. This is so cheap as to be almost free, and should never have been conditional on the tx boundary != 4096. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit e3f2ddeac718c768fdac4b7fe69d465172f788a8 Author: Ingo Molnar Date: Sat Jul 29 05:17:57 2006 +0200 [PATCH] pi-futex: robust-futex exit Fix robust PI-futexes to be properly unlocked on unexpected exit. For this to work the kernel has to know whether a futex is a PI or a non-PI one, because the semantics are different. Since the space in relevant glibc data structures is extremely scarce, the best solution is to encode the 'PI' information in bit 0 of the robust list pointer. Existing (non-PI) glibc robust futexes have this bit always zero, so the ABI is kept. New glibc with PI-robust-futexes will set this bit. Further fixes from Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Ulrich Drepper Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 627371d73cdd04ed23fe098755b4f855138ad9e0 Author: Ingo Molnar Date: Sat Jul 29 05:16:20 2006 +0200 [PATCH] pi-futex: robust-futex exit crash fix Fix pi_state->list handling bugs: list handling mishap, locking error. Plus add more debug checks and fix a few style issues i noticed while debugging this. (reported by Ulrich Drepper and Jakub Jelinek.) Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit c97d20a6c51067a38f53680d9609b4cf2867d077 Author: Andi Kleen Date: Fri Jul 28 14:44:57 2006 +0200 [PATCH] i386: Do backtrace fallback too Similar patch to earlier x86-64 patch. When the dwarf2 unwinder fails dump the left over stack with the old unwinder. Also some clarifications in the headers. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b783fd925cdd56d24d164e5bdcb072f2a67aedf4 Author: Andi Kleen Date: Fri Jul 28 14:44:54 2006 +0200 [PATCH] x86_64: Document backtracer selection options Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b13761ecd1d9977d2083da243e051e9f29097aef Author: Andi Kleen Date: Fri Jul 28 14:44:51 2006 +0200 [PATCH] x86_64: Dump leftover backtrace entries when dwarf2 unwinder got stuck The dwarf2 unwinder currently often gets stuck because a lot of assembly code doesn't have proper dwarf2 annotiation yet. This currently often happens with __down. Should fix this by adding proper dwarf2 annotation to all inline assembly. However until that's done we need a quick fix for 2.6.18 to avoid incomplete backtraces. So when this happens dump the rest of the stack with the old unwinder instead of silently not dumping it. There was already a optional "both" mode that dumped both, but that was too ugly. I also clarified the headers for the different backtraces a bit. Also add a clear error message for missing dwarf2 annotation that people can work on. And I removed a dead variable left over from Ingo's changes. Cc: mingo@elte.hu Cc: jbeulich@novell.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a4045dff782a8692637c24a0222120082c887caa Author: bibo mao Date: Fri Jul 28 14:44:48 2006 +0200 [PATCH] x86_64: Enlarge debug stack for nested kprobes In x86_64 platform, INT1 and INT3 trap stack is IST stack called DEBUG_STACK, when INT1/INT3 trap happens, system will switch to DEBUG_STACK by hardware. Current DEBUG_STACK size is 4K, when int1/int3 trap happens, kernel will minus current DEBUG_STACK IST value by 4k. But if int3/int1 trap is nested, it will destroy other vector's IST stack. This patch modifies this, it sets DEBUG_STACK size as 8K and allows two level of nested int1/int3 trap. Kprobe DEBUG_STACK may be nested, because kprobe handler may be probed by other kprobes. Thanks jbeulich for pointing out error in the first patch. [AK: nested kprobes are pretty dubious. Hopefully one nest will be enough. This will cost 8K per CPU (4K more than before)] Signed-off-by: bibo, mao Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0e92da4acb763272c6060f0b14adc2377b627d07 Author: Andi Kleen Date: Fri Jul 28 14:44:45 2006 +0200 [PATCH] x86_64: Don't clobber r8-r11 in int 0x80 handler When int 0x80 is called from long mode r8-r11 would leak out of the kernel (or rather they would be filled with some values from the kernel stack). I don't think it's a security issue because the values come from the fixed stack frame which should be near always user registers from a previous interrupt. Still better fix it. Longer term the register save macros need to be cleaned up to avoid such mistakes in the future. Original analysis from Richard Brunner, fix by me. Cc: Richard.Brunner@amd.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d5a2601734bcc740ee78dc4cb0c56b5687da7bd9 Author: Andi Kleen Date: Fri Jul 28 14:44:42 2006 +0200 [PATCH] i386/x86-64: Add user_mode checks to profile_pc for oprofile Fixes a obscure user space triggerable crash during oprofiling. Oprofile calls profile_pc from NMIs even when user_mode(regs) is not true and the program counter is inside the kernel lock section. This opens a race - when a user program jumps to a kernel lock address and a NMI happens before the illegal page fault exception is raised and the program has a unmapped esp or ebp then the kernel could oops. NMIs have a higher priority than exceptions so that could happen. Add user_mode checks to i386/x86-64 profile_pc to prevent that. Cc: John Levon Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit facf014792093d95e308b5d6ce9bc86d3c90e5b1 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Tue Jul 25 16:15:16 2006 -0400 [PATCH] i386: switch_to(): misplaced parentheses Recent changes in i386 __switch_to() have a misplaced closing parenthesis causing an unlikely() to terminate early. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Acked-by: Steven Rostedt Signed-off-by: Linus Torvalds commit 93853fd0d492524e9172297d8e8b8364dc2c4c59 Author: Alexey Dobriyan Date: Fri Jul 28 01:09:40 2006 -0700 [SUNLANCE]: fix compilation on sparc-UP Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 41ff715abc49324fb2cb20e66bc4e0290cfdbe51 Author: Nathan Scott Date: Fri Jul 28 17:05:51 2006 +1000 [XFS] Ensure bulkstat from an invalid inode number gets caught always with EINVAL. SGI-PV: 953819 SGI-Modid: xfs-linux-melb:xfs-kern:26629a Signed-off-by: Nathan Scott commit b2ea401bac39e75ebb64038609ed22efbc799905 Author: Nathan Scott Date: Fri Jul 28 17:05:13 2006 +1000 [XFS] Fix a barrier related forced shutdown on mounts with quota enabled. SGI-PV: 912426 SGI-Modid: xfs-linux-melb:xfs-kern:26622a Signed-off-by: Nathan Scott commit f5faad799475c4058416264f672bb33bf8b5ef41 Author: Nathan Scott Date: Fri Jul 28 17:04:44 2006 +1000 [XFS] Fix remount vs no/barrier options by ensuring we clear unwanted flags from iclog buffers before submitting them for writing. SGI-PV: 954772 SGI-Modid: xfs-linux-melb:xfs-kern:26605a Signed-off-by: Nathan Scott commit 2a293b7d5aa2f0d1e3d87b642f7ac263c2d664e3 Author: Christoph Hellwig Date: Fri Jul 28 17:04:26 2006 +1000 [XFS] All xfs_disk_dquot_t values are (as the name says) disk endian. Before putting them into struct statfs they should be endian-swapped. SGI-PV: 954580 SGI-Modid: xfs-linux-melb:xfs-kern:26550a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit a75ad3c27a6ad78c4306cac939938050dcde54f3 Author: Jens Axboe Date: Fri Jul 28 09:04:09 2006 +0200 [PATCH] scsi: kill overeager "not-ready" messages HAL and friends have a tendency to trigger this one all the time. It's not really interesting, so kill it. The vendor kernels all do anyways. Signed-off-by: Jens Axboe commit 71ef51cc1756d1c56b57c70e7cc27a3559c81ee6 Author: Jens Axboe Date: Fri Jul 28 09:02:17 2006 +0200 [PATCH] it821x: fix ide dma setup bug Only enable dma for a valid speed setting. Signed-off-by: Jens Axboe commit 0a8348d08677ad77ee353f96eb8745c693a05a13 Author: Jens Axboe Date: Fri Jul 28 08:58:26 2006 +0200 [PATCH] ide: if the id fields looks screwy, disable DMA It's the safer choice. Originally due to a bug in itx821x, but a generally sound thing to do. Signed-off-by: Jens Axboe commit 361934849e9c0418950bedf667732f36337d88b9 Author: Jens Axboe Date: Fri Jul 28 08:54:59 2006 +0200 [PATCH] ide: option to disable cache flushes for buggy drives Some drives claim they support cache flushing, but get seriously confused if you try. Add this option to be able to boot with barriers enabled by default. Signed-off-by: Jens Axboe commit 96ba989d22de779ca19ca214e2b2e53a4ca86b7b Author: Bob Breuer Date: Thu Jul 27 22:08:01 2006 -0700 [SPARC]: Defer clock_probe to fs_initcall() From: Bob Breuer That way all the of_driver bits will be ready. Signed-off-by: David S. Miller commit b8cfac4c2f3d12d0f4cbe6f992d945f2fdfc098d Author: David S. Miller Date: Thu Jul 27 17:57:32 2006 -0700 [SPARC64]: Fix typo in pgprot_noncached(). The sun4v code sequence was or'ing in the sun4u pte bits by mistake. Signed-off-by: David S. Miller commit 92f282988b4ce3967ee8399f7d1184ebfa04e48b Author: David S. Miller Date: Thu Jul 27 16:49:21 2006 -0700 [SPARC64]: Fix quad-float multiply emulation. Something is wrong with the 3-multiply (vs. 4-multiply) optimized version of _FP_MUL_MEAT_2_*(), so just use the slower version which actually computes correct values. Noticed by Rene Rebe Signed-off-by: David S. Miller commit ca0084fa90533687b6317e6d084141da87c74d5c Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Fri Jul 14 18:51:41 2006 -0400 [PATCH] ieee80211: TKIP requires CRC32 ieee80211_crypt_tkip will not work without CRC32. LD .tmp_vmlinux1 net/built-in.o: In function `ieee80211_tkip_encrypt': net/ieee80211/ieee80211_crypt_tkip.c:349: undefined reference to `crc32_le' Reported by Toralf Foerster Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: John W. Linville commit fe397d469fa3fbc678383ffbd0630e4849cca688 Author: Dan Williams Date: Fri Jul 14 11:41:47 2006 -0400 [PATCH] orinoco: fix setting transmit key only When determining whether there's a key to set or not, orinoco should be looking at the key length, not the key data. Otherwise confusion reigns when trying to set TX key only, passing in zero-length key, but non-NULL pointer. Key length takes precedence over non-NULL key data. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 345f6b8beb20338a2d792bf5974d01d457abee53 Author: Daniel Drake Date: Tue Jul 11 23:16:34 2006 +0100 [PATCH] softmac: do shared key auth in workqueue Johann Uhrmann reported a bcm43xx crash and Michael Buesch tracked it down to a problem with the new shared key auth code (recursive calls into the driver) This patch (effectively Michael's patch with a couple of small modifications) solves the problem by sending the authentication challenge response frame from a workqueue entry. I also removed a lone \n from the bcm43xx messages relating to authentication mode - this small change was previously discussed but not patched in. Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 8fa9ea18e831417159b7b1a76a944f117252f9ec Author: Robert Schulze Date: Wed Jul 5 22:52:43 2006 +0200 [PATCH] airo: should select crypto_aes The driver airo (for Cisco Wlan-Cards) complains about "failed to load transform for AES", when it is loaded and CRYPTO_AES is not selected in Kconfig. Signed-off-by: John W. Linville commit d91928e906e2866563a69506bb77ffebcf50613c Author: Pavel Machek Date: Thu Jul 27 14:32:40 2006 -0400 [PATCH] zd1201: workaround interference problem zd1201 has nasty tendency to emit magicall anti-wifi cloud when it is inserted into slot, but not used. Signed-off-by: Pavel Machek Signed-off-by: John W. Linville commit 468310a8a7af4f3933ade2700f01d493fa1a9754 Author: Martin Schwidefsky Date: Thu Jul 27 14:04:57 2006 +0200 [S390] update default configuration Signed-off-by: Martin Schwidefsky commit 17088229846c078aa936ca64912ab221d083aca1 Author: Cornelia Huck Date: Thu Jul 27 14:00:33 2006 +0200 [S390] duplicate ccw devices in ccwgroup. Fail to create a ccwgroup device if a ccw device is passed in twice. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit ba4ba8a69dcb446450b5ddeca48a7bd15783f4c2 Author: Peter Oberparleiter Date: Thu Jul 27 14:00:23 2006 +0200 [S390] permanent subchannel busy conditions may cause I/O stall In special conditions where a subchannel rejects the HALT I/O- instruction with a busy indication (cc 2), I/O may stall. I/O request termination logic retries HALT I/O indefinitely because it expects HALT I/O to alter the subchannel status which is not true when cc 2 is returned. In case of a busy indication, try CLEAR I/O instruction immediately. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit dffb0605e6f34c138ae5662d957fe6634dd4d71e Author: Ben Dooks Date: Wed Jul 26 21:07:04 2006 +0100 [ARM] 3733/2: S3C24XX: Remove old IDE registers in Anubis Patch from Ben Dooks Remove unused IDE static mapping, now being ioremap()d by the simtec IDE driver. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 705630dbddf743e600d654f5dc721d899db91594 Author: Ben Dooks Date: Wed Jul 26 20:16:39 2006 +0100 [ARM] 3732/1: S3C24XX: tidy syntax in osiris and anubis machines Patch from Ben Dooks Tidy the syntax, such as missing ,'s on the end of struct entries, in the Osiris and Anubis machines. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 34d926266500919a43520d3d52a4f7020b9f0687 Author: Russell King Date: Wed Jul 26 18:57:40 2006 +0100 [ARM] Fix SMP booting Processor support files now use r6 in their CPU setup code, so we can't rely on r6 being preserved. Use r7 instead. Signed-off-by: Russell King commit 64821324ca49f24be1a66f2f432108f96a24e596 Author: Christoph Hellwig Date: Wed Jul 26 09:53:23 2006 +0200 [PATCH] fix compile regression for a few scsi drivers This fixes three drivers to compile again after my patch that removes the data_cmnd member from struct scsi_cmnd. The fas216 change is trivial, it should have been using ->cmnd all the time. NCR53C9 (which seem to be mostly duplicate driver with esp.c!) is doing something odd, it should only have looked at ->cmnd before not the saved copy that is kept for the error handlers sake. Note that it really should deal with the sync setting themselves but use the generic domain validation code that get this right - but that's for later let's push this simple compile fix for now. And sorry for the late fix for this, I have been busy with OLS and associated activities last week. Signed-off-by: Christoph Hellwig Signed-off-by: Linus Torvalds commit 153d7f3fcae7ed4e19328549aa9467acdfbced10 Author: Arjan van de Ven Date: Wed Jul 26 15:40:07 2006 +0200 [PATCH] Reorganize the cpufreq cpu hotplug locking to not be totally bizare The patch below moves the cpu hotplugging higher up in the cpufreq layering; this is needed to avoid recursive taking of the cpu hotplug lock and to otherwise detangle the mess. The new rules are: 1. you must do lock_cpu_hotplug() around the following functions: __cpufreq_driver_target __cpufreq_governor (for CPUFREQ_GOV_LIMITS operation only) __cpufreq_set_policy 2. governer methods (.governer) must NOT take the lock_cpu_hotplug() lock in any way; they are called with the lock taken already 3. if your governer spawns a thread that does things, like calling __cpufreq_driver_target, your thread must honor rule #1. 4. the policy lock and other cpufreq internal locks nest within the lock_cpu_hotplug() lock. I'm not entirely happy about how the __cpufreq_governor rule ended up (conditional locking rule depending on the argument) but basically all callers pass this as a constant so it's not too horrible. The patch also removes the cpufreq_governor() function since during the locking audit it turned out to be entirely unused (so no need to fix it) The patch works on my testbox, but it could use more testing (otoh... it can't be much worse than the current code) Signed-off-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit f59fc7f30b710d45aadf715460b3e60dbe9d3418 Author: Tetsuo Handa Date: Tue Jul 25 17:05:35 2006 -0700 [IPV4/IPV6]: Setting 0 for unused port field in RAW IP recvmsg(). From: Tetsuo Handa from-linux-kernel@i-love.sakura.ne.jp The recvmsg() for raw socket seems to return random u16 value from the kernel stack memory since port field is not initialized. But I'm not sure this patch is correct. Does raw socket return any information stored in port field? [ BSD defines RAW IP recvmsg to return a sin_port value of zero. This is described in Steven's TCP/IP Illustrated Volume 2 on page 1055, which is discussing the BSD rip_input() implementation. ] Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 722874909271a807b243a797c2958e0a12992964 Author: Alexey Kuznetsov Date: Tue Jul 25 16:45:12 2006 -0700 [IPV4] ipmr: ip multicast route bug fix. IP multicast route code was reusing an skb which causes use after free and double free. From: Alexey Kuznetsov Note, it is real skb_clone(), not alloc_skb(). Equeued skb contains the whole half-prepared netlink message plus room for the rest. It could be also skb_copy(), if we want to be puristic about mangling cloned data, but original copy is really not going to be used. Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit b6e77a5346d8a739227ed73c2269966a4fd652b4 Author: Michael Chan Date: Tue Jul 25 16:39:12 2006 -0700 [TG3]: Update version and reldate Update version to 3.63. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 32d8c5724b7b05c7d8f7386c49432104cc222e32 Author: Michael Chan Date: Tue Jul 25 16:38:29 2006 -0700 [TG3]: Handle tg3_init_rings() failures Handle dev_alloc_skb() failures when initializing the RX rings. Without proper handling, the driver will crash when using a partial ring. Thanks to Stephane Doyon for reporting the bug and providing the initial patch. Howie Xu also reported the same issue. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit b9ec6c1b917e2e43a058a78198d54aeca3d71c6f Author: Michael Chan Date: Tue Jul 25 16:37:27 2006 -0700 [TG3]: Add tg3_restart_hw() Add tg3_restart_hw() to handle failures when re-initializing the device. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 44eb123126d289bac398cac0232309c228386671 Author: Jens Axboe Date: Tue Jul 25 15:05:21 2006 +0200 [PATCH] cfq-iosched: don't use a hard jiffies value, translate from msecs The CIC_SEEKY() test really wants to use the minimum of either: - 2 msecs (not jiffies) - or, the pending slice time So code it like that. Signed-off-by: Jens Axboe commit ad01b1ca797e5898cd40bb32cf0dc8c85aa9f7e8 Author: Milton Miller Date: Tue Jul 25 15:04:13 2006 +0200 [PATCH] blktrace: fix read-ahead bit It should be toggling the same bit on and off, fix it up. Signed-off-by: Jens Axboe commit 7b30f09245d0e6868819b946b2f6879e5d3d106b Author: Jens Axboe Date: Tue Jul 25 15:02:48 2006 +0200 [PATCH] cciss: fix stall with softirq handling and CFQ We need to postpone the queue startup until after the softirq handler has actually finished some requests, otherwise we could be racing with cciss_softirq_done() and not actually restart the queue handling. Signed-off-by: Jens Axboe commit d569f1d72f068992d07ab17f7ff9aea7f0d97cdb Author: Guillaume Chazarain Date: Mon Jul 24 23:45:16 2006 -0700 [IPV4]: Clear the whole IPCB, this clears also IPCB(skb)->flags. Signed-off-by: Guillaume Chazarain Signed-off-by: David S. Miller commit 6b7fdc3ae18a0598a999156b62d55ea55220e00f Author: Guillaume Chazarain Date: Mon Jul 24 23:44:44 2006 -0700 [IPV6]: Clean skb cb on IPv6 input. Clear the accumulated junk in IP6CB when starting to handle an IPV6 packet. Signed-off-by: Guillaume Chazarain Signed-off-by: David S. Miller commit d5af981e93aff0de5ad2a1a9935a3f6aa5cd3e3c Author: Patrick McHardy Date: Mon Jul 24 22:55:29 2006 -0700 [NETFILTER]: Demote xt_sctp to EXPERIMENTAL After the recent problems with all the SCTP stuff it seems reasonable to mark this as experimental. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 10ea6ac895418bd0d23900e3330daa6ba0836d26 Author: Patrick McHardy Date: Mon Jul 24 22:54:55 2006 -0700 [NETFILTER]: bridge netfilter: add deferred output hooks to feature-removal-schedule Add bridge netfilter deferred output hooks to feature-removal-schedule and disable them by default. Until their removal they will be activated by the physdev match when needed. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 28658c8967da9083be83af0a37be3b190bae79da Author: Phil Oester Date: Mon Jul 24 22:54:14 2006 -0700 [NETFILTER]: xt_pkttype: fix mismatches on locally generated packets Locally generated broadcast and multicast packets have pkttype set to PACKET_LOOPBACK instead of PACKET_BROADCAST or PACKET_MULTICAST. This causes the pkttype match to fail to match packets of either type. The below patch remedies this by using the daddr as a hint as to broadcast|multicast. While not pretty, this seems like the only way to solve the problem short of just noting this as a limitation of the match. This resolves netfilter bugzilla #484 Signed-off-by: Phil Oester Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 8cf8fb5687bb37737ea419a0b2143aab49295779 Author: Patrick McHardy Date: Mon Jul 24 22:53:35 2006 -0700 [NETFILTER]: SNMP NAT: fix byteorder confusion Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 72b558235950538da8bf5a8de746a194831c6fe6 Author: Adrian Bunk Date: Mon Jul 24 22:53:12 2006 -0700 [NETFILTER]: conntrack: fix SYSCTL=n compile Signed-off-by: Adrian Bunk Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3bc38712e3a6e0596ccb6f8299043a826f983701 Author: Patrick McHardy Date: Mon Jul 24 22:52:47 2006 -0700 [NETFILTER]: nf_queue: handle NF_STOP and unknown verdicts in nf_reinject In case of an unknown verdict or NF_STOP the packet leaks. Unknown verdicts can happen when userspace is buggy. Reinject the packet in case of NF_STOP, drop on unknown verdicts. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 083edca05ab1fa6efac1ba414018f7f45a4a83ff Author: Patrick McHardy Date: Mon Jul 24 22:52:10 2006 -0700 [NETFILTER]: H.323 helper: fix possible NULL-ptr dereference An RCF message containing a timeout results in a NULL-ptr dereference if no RRQ has been seen before. Noticed by the "SATURN tool", reported by Thomas Dillig and Isil Dillig . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6bc063d414a815937fc81449fa9ffe8d3a4cdf22 Author: David S. Miller Date: Mon Jul 24 22:47:14 2006 -0700 [SCSI] esp: Fix build. The data_cmd[] member got deleted, so do not use it any more. Scsi commands do not have their ->cmd[] overwritten temporary to probe for status after an error before retrying. Signed-off-by: David S. Miller commit 29ed46015dd61f99d203ec7ab307ccf92d2d0cf2 Author: David S. Miller Date: Sat Jul 22 02:05:07 2006 -0700 [SPARC]: Fix SA_STATIC_ALLOC value. It alises IRQF_SHARED which causes all kinds of problems. Signed-off-by: David S. Miller commit eb398d1044e0c1c19c2f5041acdb29ddb5bbc9f8 Author: David S. Miller Date: Sat Jul 22 01:12:09 2006 -0700 [SPARC64]: Explicitly print return PC when the kernel fault PC is bogus. That way we'll have at least some debugging info even if the stack dump explodes. Signed-off-by: David S. Miller commit b4e54de8d34afe7fcf08bfe91070d9dfeae6ed27 Author: Christoph Hellwig Date: Mon Jul 24 15:31:14 2006 -0700 [NET]: Correct dev_alloc_skb kerneldoc dev_alloc_skb is designated for RX descriptors, not TX. (Some drivers use it for the latter anyway, but that's a different story) Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 37182d1bd3264cf9c0dce3408bee48af0755de7e Author: Christoph Hellwig Date: Mon Jul 24 15:30:28 2006 -0700 [NET]: Remove CONFIG_HAVE_ARCH_DEV_ALLOC_SKB skbuff.h has an #ifndef CONFIG_HAVE_ARCH_DEV_ALLOC_SKB to allow architectures to reimplement __dev_alloc_skb. It's not set on any architecture and now that we have an architecture-overrideable NET_SKB_PAD there is not point at all to have one either. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 6c753c3d3be0f8d1b570ec5720ad1bb4caf8232b Author: Stefan Rompf Date: Mon Jul 24 13:52:13 2006 -0700 [VLAN]: Fix link state propagation When the queue of the underlying device is stopped at initialization time or the device is marked "not present", the state will be propagated to the vlan device and never change. Based on an analysis by Patrick McHardy. Signed-off-by: Stefan Rompf ACKed-by: Patrick McHardy Signed-off-by: David S. Miller commit a922ba5510530ae8e3c60edc85c56f72347a3c86 Author: David S. Miller Date: Mon Jul 24 13:49:06 2006 -0700 [IPV6] xfrm6_tunnel: Delete debugging code. It doesn't compile, and it's dubious in several regards: 1) is enabled by non-Kconfig controlled CONFIG_* value (noted by Randy Dunlap) 2) XFRM6_TUNNEL_SPI_MAGIC is defined after it's first use 3) the debugging messages print object pointer addresses which have no meaning without context So let's just get rid of it. Signed-off-by: David S. Miller commit d8ca3d11c6611685ea7783b4acb623bf08496f94 Author: Martin Michlmayr Date: Mon Jul 24 21:30:01 2006 +0100 [ARM] 3731/1: Allow IRQ definitions of IQ80331 and IQ80332 to co-exist Patch from Martin Michlmayr ARCH_IQ80331 and MACH_IQ80332 can be enabled at the same time but a header file makes certain IRQ definitions conditional, leading to the following compilation error when both platforms are enabled: arch/arm/mach-iop3xx/iq80332-pci.c: In function 'iq80332_map_irq': arch/arm/mach-iop3xx/iq80332-pci.c:54: error: 'IRQ_IQ80332_INTA' undeclared (first use in this function) arch/arm/mach-iop3xx/iq80332-pci.c:54: error: (Each undeclared identifier is reported only once arch/arm/mach-iop3xx/iq80332-pci.c:54: error: for each function it appears in.) arch/arm/mach-iop3xx/iq80332-pci.c:54: error: 'IRQ_IQ80332_INTB' undeclared (first use in this function) arch/arm/mach-iop3xx/iq80332-pci.c:54: error: 'IRQ_IQ80332_INTC' undeclared (first use in this function) arch/arm/mach-iop3xx/iq80332-pci.c:54: error: 'IRQ_IQ80332_INTD' undeclared (first use in this function) Signed-off-by: Martin Michlmayr Signed-off-by: Russell King commit e9e9290f5c85887baf1123a36ec9fdf56a10cf4b Author: Marcel Holtmann Date: Tue Jul 18 18:32:33 2006 +0200 [Bluetooth] Enable SCO support for Broadcom HID proxy dongle The Broadcom dongles with HID proxy support actually support SCO over HCI if the SCO buffer size values are corrected. So instead of disabling the SCO support, mark this dongle with the quirk for the Bluetooth core to correct the wrong buffer size values. Signed-off-by: Marcel Holtmann commit 8e4f7230a3bd015862f3af58dc563dbc1cdebfe2 Author: Marcel Holtmann Date: Tue Jul 18 18:04:59 2006 +0200 [Bluetooth] Add quirk for another broken RTX Telecom based dongle This patch disables the ISOC transfers for another broken RTX Telecom based USB dongle. Starting the USB ISOC transfers only ends in a burst of error messages for invalid SCO packets on connection handle 0. Signed-off-by: Marcel Holtmann commit ea9727f6e55dabc7a58cf56c87e65665e239e171 Author: Marcel Holtmann Date: Tue Jul 18 17:47:40 2006 +0200 [Bluetooth] Correct SCO buffer size for Belkin devices The Belkin F8T012 and F8T013 devices are both based on a Bluetooth chip from Broadcom and their SCO buffer size values are wrong. The Bluetooth core should correct these values. Signed-off-by: Marcel Holtmann commit 520ca78acc652c89c92e8bf29536319afa9d88bb Author: Marcel Holtmann Date: Fri Jul 14 16:01:52 2006 +0200 [Bluetooth] Correct SCO buffer size for another Broadcom chip The SCO buffer size values on IBM/Lenovo ThinkPad laptops with a Bluetooth chip from Broadcom are wrong. The USB Bluetooth driver has to set a quirk to correct the SCO buffer size values. Signed-off-by: Marcel Holtmann commit 98bcd08b5bfe78c1c9bda5768aa081e0fe4fcc4f Author: Marcel Holtmann Date: Fri Jul 14 11:42:12 2006 +0200 [Bluetooth] Correct RFCOMM channel MTU for broken implementations Some Bluetooth RFCOMM implementations try to negotiate a bigger channel MTU than we can support for a particular session. The maximum MTU for a RFCOMM session is limited through the L2CAP layer. So if the other side proposes a channel MTU that is bigger than the underlying L2CAP MTU, we should reduce it to the L2CAP MTU of the session minus five bytes for the RFCOMM headers. Signed-off-by: Marcel Holtmann commit 2266d8886f64c66e0a4e61e3e1c19dbc27ed00d4 Author: Guillaume Chazarain Date: Sun Jul 23 23:37:24 2006 -0700 [PKT_SCHED]: Fix regression in PSCHED_TADD{,2}. In PSCHED_TADD and PSCHED_TADD2, if delta is less than tv.tv_usec (so, less than USEC_PER_SEC too) then tv_res will be smaller than tv. The affectation "(tv_res).tv_usec = __delta;" is wrong. The fix is to revert to the original code before 4ee303dfeac6451b402e3d8512723d3a0f861857 and change the 'if' in 'while'. [Shuya MAEDA: "while (__delta >= USEC_PER_SEC){ ... }" instead of "while (__delta > USEC_PER_SEC){ ... }"] Signed-off-by: Guillaume Chazarain Signed-off-by: David S. Miller commit 4b79f0af48d529a360d3529def01835dc5d45fe1 Author: Ian McDonald Date: Sun Jul 23 23:33:28 2006 -0700 [DCCP]: Fix default sequence window size When using the default sequence window size (100) I got the following in my logs: Jun 22 14:24:09 localhost kernel: [ 1492.114775] DCCP: Step 6 failed for DATA packet, (LSWL(6279674225) <= P.seqno(6279674749) <= S.SWH(6279674324)) and (P.ackno doesn't exist or LAWL(18798206530) <= P.ackno(1125899906842620) <= S.AWH(18798206548), sending SYNC... Jun 22 14:24:09 localhost kernel: [ 1492.115147] DCCP: Step 6 failed for DATA packet, (LSWL(6279674225) <= P.seqno(6279674750) <= S.SWH(6279674324)) and (P.ackno doesn't exist or LAWL(18798206530) <= P.ackno(1125899906842620) <= S.AWH(18798206549), sending SYNC... I went to alter the default sysctl and it didn't take for new sockets. Below patch fixes this. I think the default is too low but it is what the DCCP spec specifies. As a side effect of this my rx speed using iperf goes from about 2.8 Mbits/sec to 3.5. This is still far too slow but it is a step in the right direction. Compile tested only for IPv6 but not particularly complex change. Signed off by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 8fdf679fdb00f588b65abb9c775c178098a05aeb Author: Roland Dreier Date: Mon Jul 24 09:36:50 2006 -0700 IB/mthca: Initialize max_cmds before debug code prints it Read the max_cmds value from the response to the QUERY_FW command before printing out the value, so that the real value goes into the debug output. Signed-off-by: Roland Dreier commit 8a7f752125a930a83f4d8dfe37fa5a081ab19d31 Author: Michael S. Tsirkin Date: Wed Jul 19 17:44:37 2006 +0300 IB/ipoib: Fix packet loss after hardware address update The neighbour ha field may get updated without destroying the neighbour. In this case, the ha field gets out of sync with the address handle stored in ipoib_neigh->ah, with the result that the ah field would point to an incorrect path, resulting in all packets being lost. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 624d01f899f6bbd75fd06890f231e1f46555d376 Author: Or Gerlitz Date: Mon Jul 24 10:42:00 2006 +0300 IB/ipoib: Fix oops with ipoib_debug_mcast set Need to set mcast->ah before debug code dereferences it. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 2527e681fd4fd4231c2e04f09d7b04d3cab8eefe Author: Sean Hefty Date: Thu Jul 20 11:25:50 2006 +0300 IB/mad: Validate MADs for spec compliance Validate MADs sent by userspace clients for spec compliance with C13-18.1.1 (prevent duplicate requests and responses sent on the same port). Without this, RMPP transactions get aborted because of duplicate packets. This patch is similar to that provided by Jack Morgenstein. Signed-off-by: Sean Hefty Signed-off-by: Michael S. Tsirkin Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 16c59419a09f0140a07a1828d6a45656265e07c7 Author: Ralph Campbell Date: Mon Jul 17 18:21:24 2006 -0700 IB/ipath: ipath_skip_sge() can break if num_sge > 1 ipath_skip_sge() doesn't exactly duplicate the side effects of ipath_copy_sge() if num_sge > 1 since it doesn't decrement ss->num_sge. This could result in the sg_list being accessed out of bounds. Since ipath_skip_sge() is almost always called with num_sge == 1, the original "optimization" is almost never used. Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier commit c9f79bdc21da9c8d466b6ba7c8bbd6b8e0110ce2 Author: Ralph Campbell Date: Mon Jul 17 18:19:54 2006 -0700 IB/ipath: Fix ib_ipath driver to work with SRP I am still working on a proposal to remove the phys_to_virt() calls in the ib_ipath driver. In the mean time, this patch allows SRP to work by fixing the R_Key check and conversion from IB address to kernel virtual address. It also returns the correct page size for FMRs. Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier commit 3d37b9e209136cf178562bbedc7cd2ecb1da8beb Author: Ralph Campbell Date: Mon Jul 17 18:18:36 2006 -0700 IB/ipath: Fix a data corruption This patch fixes a problem where certain error packets are passed to the InfiniBand layer for processing even though the packet actually was received with an error. Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier commit 1252c517cf3df240ae51946a096035765dfd2e6d Author: Dotan Barak Date: Thu Jul 13 11:05:49 2006 +0300 IB/mthca: Fix SRQ limit event range check Mem-free HCAs always keep one spare SRQ WQE, so the SRQ limit cannot be set beyond srq->max - 1. Signed-off-by: Dotan Barak Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 8419dc8a34d765f2ff1aa4051084d54cfeff09cf Author: Jeff Garzik Date: Mon Jul 24 03:37:52 2006 -0400 [libata] sata_promise: comment out duplicate PCI ID This is just the for-RC fix. A 'TODO' command is added, describing what's needed for the more-complete fix. commit 43db2bc04409b1e1b74f9768e3284cec18a87d0b Author: Roland Dreier Date: Sun Jul 23 15:16:04 2006 -0700 IB/uverbs: Fix lockdep warnings Lockdep warns because uverbs is trying to take uobj->mutex when it already holds that lock. This is because there are really multiple types of uobjs even though all of their locks are initialized in common code. Signed-off-by: Roland Dreier commit ec924b4726e3df000d3ac7ae10cb8ef1adcd60ca Author: Michael S. Tsirkin Date: Mon Jul 17 18:20:51 2006 +0300 IB/uverbs: Fix unlocking in error paths ib_uverbs_create_ah() and ib_uverbs_create_srq() did not release the PD's read lock in their error paths, which lead to deadlock when destroying the PD. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit abb5a5cc6bba1516403146c5b79036fe843beb70 Author: Paul Jackson Date: Sun Jul 23 11:36:08 2006 -0700 [PATCH] Cpuset: fix ABBA deadlock with cpu hotplug lock Fix ABBA deadlock between lock_cpu_hotplug() and the cpuset callback_mutex lock. It only happens on cpu_exclusive cpusets, due to the dynamic sched domain code trying to take the cpu hotplug lock inside the cpuset callback_mutex lock. This bug has apparently been here for several months, but didn't get hit until the right customer load on a large system. This fix appears right from inspection, but it will take a few more days running it on that customers workload to be confident we nailed it. We don't have any other reproducible test case. The cpu_hotplug_lock() tends to cover large runs of code. The other places that hold both that lock and the cpuset callback mutex lock always nest the cpuset lock inside the hotplug lock. This place tries to do the reverse, risking an ABBA deadlock. This is in the cpuset_rmdir() code, where we: * take the callback_mutex lock * mark the cpuset CS_REMOVED * call update_cpu_domains for cpu_exclusive cpusets * in that call, take the cpu_hotplug lock if the cpuset is marked for removal. Thanks to Jack Steiner for identifying this deadlock. The fix is to tear down the dynamic sched domain before we grab the cpuset callback_mutex lock. This way, the two locks are serialized, with the hotplug lock taken and released before trying for the cpuset lock. I suspect that this bug was introduced when I changed the cpuset locking from one lock to two. The dynamic sched domain dependency on cpu_exclusive cpusets and its hotplug hooks were added to this code earlier, when cpusets had only a single lock. It may well have been fine then. Signed-off-by: Paul Jackson Signed-off-by: Linus Torvalds commit aa95387774039096c11803c04011f1aa42d85758 Author: Linus Torvalds Date: Sun Jul 23 12:12:16 2006 -0700 cpu hotplug: simplify and hopefully fix locking The CPU hotplug locking was quite messy, with a recursive lock to handle the fact that both the actual up/down sequence wanted to protect itself from being re-entered, but the callbacks that it called also tended to want to protect themselves from CPU events. This splits the lock into two (one to serialize the whole hotplug sequence, the other to protect against the CPU present bitmaps changing). The latter still allows recursive usage because some subsystems (ondemand policy for cpufreq at least) had already gotten too used to the lax locking, but the locking mistakes are hopefully now less fundamental, and we now warn about recursive lock usage when we see it, in the hope that it can be fixed. Signed-off-by: Linus Torvalds commit 2cd7cbdf4bd0d0fe58e4dc903e8b413412595504 Author: Linus Torvalds Date: Sun Jul 23 12:05:00 2006 -0700 [cpufreq] ondemand: make shutdown sequence more robust Shutting down the ondemand policy was fraught with potential problems, causing issues for SMP suspend (which wants to hot- unplug) all but the last CPU. This should fix at least the worst problems (divide-by-zero and infinite wait for the workqueue to shut down). Signed-off-by: Linus Torvalds commit 9df3f3d28bca0157e2bab2f3171d2ad4f0930634 Author: Panagiotis Issaris Date: Fri Jul 21 15:52:20 2006 -0700 [TIPC]: Removing useless casts Removing useless casts Signed-off-by: Panagiotis Issaris Signed-off-by: David S. Miller commit 8265abc082d2283b4ef20237efadb71c6f16ed0c Author: Patrick McHardy Date: Fri Jul 21 15:09:55 2006 -0700 [IPV4]: Fix nexthop realm dumping for multipath routes Routing realms exist per nexthop, but are only returned to userspace for the first nexthop. This is due to the fact that iproute2 only allows to set the realm for the first nexthop and the kernel refuses multipath routes where only a single realm is present. Dump all realms for multipath routes to enable iproute to correctly display them. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9ed36279f68c990d65cd3d64f27d81313474a118 Author: Nicolas Dichtel Date: Fri Jul 21 15:09:07 2006 -0700 [DUMMY]: Avoid an oops when dummy_init_one() failed Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller commit 4a9c74e5830444c1c3235848e06402c1d2ece1ea Author: Nicolas Dichtel Date: Fri Jul 21 14:56:02 2006 -0700 [IFB] After ifb_init_one() failed, i is increased. Decrease It before entering in the loop for freeing the other ifb devices. Signed-off-by: Nicolas Dichtel Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 53c4b2cc7a05c034fd21d104d2ab43ea8cc0e075 Author: Herbert Xu Date: Fri Jul 21 14:55:38 2006 -0700 [NET]: Fix reversed error test in netif_tx_trylock A non-zero return value indicates success from spin_trylock, not error. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit bf9915cc55cb8d18d4e3a8de3d1578a9af4a2e8b Author: David S. Miller Date: Fri Jul 21 14:55:17 2006 -0700 [MAINTAINERS]: Mark LAPB as Oprhan. Maintainer email not longer exists. Signed-off-by: David S. Miller commit 0da974f4f303a6842516b764507e3c0a03f41e5a Author: Panagiotis Issaris Date: Fri Jul 21 14:51:30 2006 -0700 [NET]: Conversions from kmalloc+memset to k(z|c)alloc. Signed-off-by: Panagiotis Issaris Signed-off-by: David S. Miller commit a0ee7c70b22f78593957f99faa06acb4747b8bc0 Author: Jiri Slaby Date: Fri Jul 21 14:51:02 2006 -0700 [NET]: sun happymeal, little pci cleanup Use pci_register_driver instead of pci_module_init. Use PCI_DEVICE macro. Signed-off-by: Jiri Slaby Signed-off-by: David S. Miller commit 485fb2c998a37d5c3c6aa082aa451e66db90f34a Author: Samuel Ortiz Date: Fri Jul 21 14:50:41 2006 -0700 [IrDA]: Use alloc_skb() in IrDA TX path As pointed out by Christoph Hellwig, dev_alloc_skb() is not intended to be used for allocating TX sk_buff. The IrDA stack was exclusively calling dev_alloc_skb() on the TX path, and this patch fixes that. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit b82631581372dc00b3507cedc3ad47af29efe962 Author: Henrik Kretzschmar Date: Fri Jul 21 14:50:13 2006 -0700 [I/OAT]: Remove pci_module_init() from Intel I/OAT DMA engine Changes pci_module_init() to pci_register_driver(). Signed-off-by: Henrik Kretzschmar Signed-off-by: David S. Miller commit 64d2f0855e50a7185546ee1fbc03c2badc31330f Author: Adrian Bunk Date: Fri Jul 21 14:49:49 2006 -0700 [I/OAT]: net/core/user_dma.c should #include Every file should #include the headers containing the prototypes for its global functions. Especially in cases like this one where gcc can tell us through a compile error that the prototype was wrong... Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit dc022a9874d026c7d1635ae66d1afafc5f053731 Author: Sridhar Samudrala Date: Fri Jul 21 14:49:25 2006 -0700 [SCTP]: ADDIP: Don't use an address as source until it is ASCONF-ACKed This implements Rules D1 and D4 of Sec 4.3 in the ADDIP draft. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 9faa730f1cbb951e95cb18e71b0fe265014c2450 Author: Sridhar Samudrala Date: Fri Jul 21 14:49:07 2006 -0700 [SCTP]: Set chunk->data_accepted only if we are going to accept it. Currently there is a code path in sctp_eat_data() where it is possible to set this flag even when we are dropping this chunk. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit ad8fec1720e000ba2384de6408076a60fc92a981 Author: Sridhar Samudrala Date: Fri Jul 21 14:48:50 2006 -0700 [SCTP]: Verify all the paths to a peer via heartbeat before using them. This patch implements Path Initialization procedure as described in Sec 2.36 of RFC4460. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit cfdeef3282705a4b872d3559c4e7d2561251363c Author: Vlad Yasevich Date: Fri Jul 21 14:48:26 2006 -0700 [SCTP]: Unhash the endpoint in sctp_endpoint_free(). This prevents a race between the close of a socket and receive of an incoming packet. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 37fa6878bcd54c25fbe6ebb3da5cf0d3a4bc7a65 Author: Sridhar Samudrala Date: Fri Jul 21 14:45:47 2006 -0700 [SCTP]: Check for NULL arg to sctp_bucket_destroy(). Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 89e1df74f841fc31e81838d30594c4eff01859f8 Author: Guillaume Chazarain Date: Fri Jul 21 14:45:25 2006 -0700 [PKT_SCHED] netem: Fix slab corruption with netem (2nd try) CONFIG_DEBUG_SLAB found the following bug: netem_enqueue() in sch_netem.c gets a pointer inside a slab object: struct netem_skb_cb *cb = (struct netem_skb_cb *)skb->cb; But then, the slab object may be freed: skb = skb_unshare(skb, GFP_ATOMIC) cb is still pointing inside the freed skb, so here is a patch to initialize cb later, and make it clear that initializing it sooner is a bad idea. [From Stephen Hemminger: leave cb unitialized in order to let gcc complain in case of use before initialization] Signed-off-by: Guillaume Chazarain Signed-off-by: David S. Miller commit fbeff3c1d35d07b1f967e47fcfb00cd16b7ecd02 Author: Krzysztof Halasa Date: Fri Jul 21 14:44:55 2006 -0700 [WAN]: Converted synclink drivers to use netif_carrier_*() WAN: Converted synclink drivers to use netif_carrier_*() instead of hdlc_set_carrier(). Signed-off-by: Krzysztof Halasa Signed-off-by: David S. Miller commit 41b1d174442d0845e58af4b1b171930fc09872c7 Author: Krzysztof Halasa Date: Fri Jul 21 14:41:36 2006 -0700 [WAN]: Cosmetic changes to N2 and C101 drivers WAN: Cosmetic changes to N2 and C101 drivers Signed-off-by: Krzysztof Halasa Signed-off-by: David S. Miller commit 4bc83b4d409edacb33db6c71d03e963d9728476c Author: Krzysztof Halasa Date: Fri Jul 21 14:41:01 2006 -0700 [WAN]: Added missing netif_dormant_off() to generic HDLC WAN: Fixed a problem with PPP/raw HDLC/X.25 protocols not doing netif_dormant_off() at startup. Signed-off-by: Krzysztof Halasa Signed-off-by: David S. Miller commit 5d9c5a32920c5c0e6716b0f6ed16157783dc56a4 Author: Herbert Xu Date: Fri Jul 21 14:29:53 2006 -0700 [IPV4]: Get rid of redundant IPCB->opts initialisation Now that we always zero the IPCB->opts in ip_rcv, it is no longer necessary to do so before calling netif_rx for tunneled packets. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit efab4cbe99f9b73d208ad9e5ec9388524005e095 Author: David S. Miller Date: Fri Jul 21 14:19:45 2006 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 8310a32c15c76623bbe2425d38688a9d5b3e50a9 Author: David S. Miller Date: Fri Jul 21 14:12:39 2006 -0700 [SPARC]: Fix length parameter verification in sys_getdomainname(). Found by scrashme. Signed-off-by: David S. Miller commit 8a84eb164cc44a7604a27f8118473a82b45472a8 Author: David S. Miller Date: Wed Jul 19 22:55:08 2006 -0700 [SERIAL] sunzilog: Fix instance enumeration. Just do a linear enumeration so that we handle sun4d systems correctly. As a consequence, eliminate the hard coded keyboard and mouse channel line values, use the CONS_{KEYB,MS} flags instead. Also, report the keyboard/mouse Zilog channels just like the uart ones do. Signed-off-by: David S. Miller commit b77d35b7229164304d6fb8f047b9bcd3da2c9592 Author: David S. Miller Date: Wed Jul 19 21:04:04 2006 -0700 [SERIAL] sunzilog: Remove duplicate IRQ registry in zs_probe(). We do it now in sunzilog_init() after all devices have been probed. Signed-off-by: David S. Miller commit 8b3c848cc89e62904e6d9c8f9fed13d5c225572d Author: Raymond Burns Date: Mon Jul 17 21:57:09 2006 -0700 [SPARC]: Get sun4d SMP building again. Signed-off-by: David S. Miller commit 198c167c5424d30d4f6687aed6e54ef71036f8e9 Author: Raymond Burns Date: Mon Jul 17 21:50:55 2006 -0700 [SPARC]: Do not call sun4m_irq_rotate on sun4d. Signed-off-by: David S. Miller commit c2d3bffebc2cb651ed33abae2434f85cd503a498 Author: David S. Miller Date: Mon Jul 17 21:49:58 2006 -0700 [SPARC]: Simplify and correct __cpu_find_by() By using for_each_node_by_type(). Also, correct a spurioud test in check_cpu_node() on sparc64. It is only called with nodes that have device_type "cpu". Signed-off-by: David S. Miller commit 2f72ba43581890d003427053ebe4dfaa14e5f4b0 Author: Raymond Burns Date: Mon Jul 17 21:40:27 2006 -0700 [SPARC]: Initialize iounit spinlock in iounit_init(). Signed-off-by: David S. Miller commit 9d7ab1f4d56dffcddc1177b3cd55b6da6620e1e1 Author: David S. Miller Date: Mon Jul 17 21:39:09 2006 -0700 [SPARC]: Fix initialization of sun4d SBUS interrupts. 1) Explicitly traverse to the root looking for the "sbi". 2) Grab the "board#" property from the sbi's parent and verify that this parent is an "io-unit" node. 3) Skip IRQ initialization when device lacks "reg" property. Signed-off-by: David S. Miller commit 67e23a1e60b6bc0a090407d0fc060166ab558b72 Author: David S. Miller Date: Mon Jul 17 21:07:17 2006 -0700 [SERIAL] sunzilog: Register IRQ after all devices have been probed. Otherwise we will deref half-initialized channel pointers and crash in the interrupt handler. Signed-off-by: David S. Miller commit 39329329565a5e24f0a5523eef3a9dd941e0b29d Author: David S. Miller Date: Mon Jul 17 21:06:15 2006 -0700 [SPARC] sbus: Make sure sbus nodes are named uniquely. Just name them "sbus%d" otherwise on sun4d we try to register multiple entries named "sbi@0,0" which does not work. Based upon a report from Raymond Burns. Signed-off-by: David S. Miller commit f7785a64d117951e4c2bf9418d8c1dd59fe53b36 Author: Bob Breuer Date: Mon Jul 17 17:05:56 2006 -0700 [SPARC]: Fix property name acquisition in prom.c On sparc32 the prom_{first,next}prop() interfaces work a little differently. The buffer argument is ignored on sparc32 and the firmware just returns a raw pointer to the property name. Signed-off-by: David S. Miller commit bda2f7b4801964351253706d1a87e4d2110829a5 Author: David S. Miller Date: Mon Jul 17 16:40:26 2006 -0700 [SERIAL] sunsab: Get line numbers and table sizing correct. Table sizing code should look for "se" not "su" nodes. The chip at the lower address should get the first index. Signed-off-by: David S. Miller commit 44f2650b134b423128063ded29a11454b924390e Author: Marc Zyngier Date: Mon Jul 17 15:53:32 2006 -0700 [SPARC64] Fix sunsab ports ordering Register second SAB port before the first one, as serial A is wired to it, and expected to appear as ttyS0. Signed-off-by: Marc Zyngier Signed-off-by: David S. Miller commit 06ffd7956e4790d824b4b5575b56def8448ec6d4 Author: David S. Miller Date: Sun Jul 16 22:19:40 2006 -0700 [SPARC]: Kill prom_getname, unused and not implemented properly. The m68k port's sun3 asm/oplib.h had a stray reference too, so I killed that off as well. Signed-off-by: David S. Miller commit 46ba6d7d8b0486e9d565729880ddfb2b84d3af31 Author: David S. Miller Date: Sun Jul 16 22:10:44 2006 -0700 [SPARC64]: Fix more of_device layer IRQ bugs, and correct PROMREG_MAX. Sabre and Psycho PCI controllers can have partial interrupt-map properties, meaning that on-board devices don't match up to any entries. Instead, they are fully specified from the beginning and we should pass them directly to the IRQ translator as-is. Also, fill in the necessary translator slots for the "graphics" and "expansion UPA" interrupts on Sabre, Psycho, and SYSIO SBUS. Increase PROMREG_MAX to 24, as seen on SUNW,ffb devices. Finally, prevent accidentally writing past the end of the of_device struct resource[] and irqs[] arrays. Spit out a log message when we ignore some entries because there are too many of them. Signed-off-by: David S. Miller commit 59b693fbbec37765426ba0916920ff93d2e26eb3 Author: Jay Cliburn Date: Thu Jul 20 23:23:57 2006 +0200 via-velocity: fix speed and link status reported by ethtool The via-velocity driver reports incorrect speed and link detected status as viewed by ethtool (and probably other tools). This patch fixes those incorrect reports and prettifies a long line. Signed-off-by: Jay Cliburn Signed-off-by: Francois Romieu commit 13abf50df209008b5d44075bafeeab42ace56aa6 Author: Tejun Heo Date: Mon Jul 10 23:18:46 2006 +0900 [PATCH] libata: improve EH action and EHI flag handling Update ata_eh_about_to_do() and ata_eh_done() to improve EH action and EHI flag handling. * There are two types of EHI flags - one which expires on successful EH and the other which expires on a successful reset. Make this distinction clear. * Unlike other EH actions, reset actions are represented by two EH action masks and a EHI modifier. Implement correct about_to_do/done semantics for resets. That is, prior to reset, related EH info is sucked in from ehi and cleared, and after reset is complete, related EH info in ehc is cleared. These changes improve consistency and remove unnecessary EH actions caused by stale EH action masks and EHI flags. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 7c8c2cff81b2b7f6dd3f9fd7b77033c1be5d7920 Author: Tejun Heo Date: Mon Jul 10 23:18:23 2006 +0900 [PATCH] libata: fix eh_skip_recovery condition * (ata_dev_absent() || ata_dev_ready()) test doesn't indicate SUSPENDED state properly. Fix it. * Link resuming resets shouldn't be skipped. Don't skip recovery on EHI_RESUME_LINK. This doesn't matter for host ports as EHI_RESUME always coincides with EHI_HOTPLUGGED which makes attached disabled devices vacant. However, PMP reset causes non-hotplug link-resuming resets which shouldn't be skipped. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 4528e4da79675b4995e085046b8ffbe0415c3261 Author: Tejun Heo Date: Sat Jul 8 20:17:26 2006 +0900 [PATCH] libata: fix autopsy ehc->i.action and ehc->i.dev handling Commit 0662c58b3265f52f708a6d59476bc7862b01f9c0 updated ata_eh_autopsy() to OR determined action to ehc->i.action to preserve action mask set directly into ehc->i.action by nested functions. This broke action mask clearing on SENSE_VALID case causing revalidation and EH complete message on successful ATAPI CC. This patch removes two local variables - action and failed_dev - which cache ehc->i.action and ehc->i.dev respectively, and make the function directly modify ehc->i.* fields to remove aliasing issues. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d7cf0d57ef9e07cf0f65c58c19a8e7c4a9db72b5 Author: Heiko Carstens Date: Tue Jul 18 13:46:58 2006 +0200 [S390] sysfs_create_xxx return values. Take return values of sysfs_create_group & friends into account. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit dc8f5d21dd6bdd94e5c5bf9bbcc616d00f0cc839 Author: Heiko Carstens Date: Tue Jul 18 13:44:57 2006 +0200 [S390] .align 4096 statements in head.S SLES9 binutils don't like .align 4096 statements in head.S. Work around this by using .org statements. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit bdd01503c3e4e9827df015bc7e440d5498308fdd Author: Jens Osterkamp Date: Thu Jul 13 11:54:08 2006 +0200 [PATCH] spidernet: rework tx queue handling With this patch TX queue descriptors are not chained per default any more. The pointer to next descriptor is set only when next descriptor is prepaired for transfer. Also the mechanism of checking wether Spider is ready has been changed: it checks not for CARDOWNED flag in status of previous descriptor but for a TXDMAENABLED flag in Spider's register. Signed-off-by: Maxim Shchetynin Signed-off-by: Arnd Bergmann Signed-off-by: Jens Osterkamp Signed-off-by: Jeff Garzik commit ee962a5cee5b534666dbfa5e3ec3c633c90c6b1a Author: Jens Osterkamp Date: Thu Jul 13 11:54:23 2006 +0200 [PATCH] spidernet: bug fix for init code We want to intitialize addr instead of data register first. Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit caa0371e8b7391919d984672c887f660a6117f67 Author: Stephen Hemminger Date: Mon Jul 17 09:54:34 2006 -0400 [PATCH] sky2: NAPI poll fix When sky2 driver gets lots of received packets at once, it can get stuck. The NAPI poll routine gets called back to keep going, but since no IRQ bits are set it doesn't make progress. Increase version, since this is serious enough problem that I want to be able to tell new from old problems. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit e1b90c416d6e6b71fc63974c1798e3cf55bba77f Author: Jeff Garzik Date: Mon Jul 17 12:54:40 2006 -0400 [NET] ethtool: fix oops by testing correct struct member Noticed by Willy Tarreau. Signed-off-by: Jeff Garzik commit 53ba5e09fe37518683ff8b3f28410ce0b9ed2f74 Author: Andreas Krebbel Date: Mon Jul 17 16:09:42 2006 +0200 [S390] get_clock inline assembly. Add missing volatile to the get_clock / get_cycles inline assemblies to avoid that consecutive calls get optimized away. Signed-off-by: Andreas Krebbel Signed-off-by: Martin Schwidefsky commit 13ffa927abb74d4365b0e22f186befe4746b5897 Author: Cornelia Huck Date: Mon Jul 17 16:09:28 2006 +0200 [S390] channel measurement interval display. Display avg_sample_interval in nanoseconds, like it is documented. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit f257b06322c8a30c050a286c45fda68f23b9bc44 Author: Heiko Carstens Date: Mon Jul 17 16:09:23 2006 +0200 [S390] xpram module parameter parsing - take 2. Don't use memparse since the default size modifier is 'k'. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 5a651c93d3a823af63b1b15bb94fdc951670fb2f Author: Heiko Carstens Date: Mon Jul 17 16:09:18 2006 +0200 [S390] Fix gcc warning about unused return values. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit f5beec49636bf8d5a34065c8ab030cd4ea84516f Author: Jeff Garzik Date: Tue Jul 11 15:28:12 2006 -0400 [libata] ata_piix: correct 'invalid MAP value' typo-caused error Signed-off-by: Jeff Garzik commit 73291a1cb68bb62be62a927a9d67fe417b3cfe35 Author: Jeff Garzik Date: Tue Jul 11 13:11:17 2006 -0400 [libata] ata_piix: minor cleanups noticed in prior patch run * delete unused PIIX_FLAG_COMBINED* * port_enable should be u16 rather than u32 Signed-off-by: Jeff Garzik commit 08f12edc335d24a89ba2f50b0a5b9d12295ce198 Author: Jeff Garzik Date: Tue Jul 11 11:57:44 2006 -0400 [libata] ata_piix: attempt to fix ICH8 support Take into account the fact that ICH8 changed the register layout of the MAP and PCS register bits. Signed-off-by: Jeff Garzik commit ea35d29e2fa8b3d766a2ce8fbcce599dce8d2734 Author: Jeff Garzik Date: Tue Jul 11 11:48:50 2006 -0400 [libata] ata_piix: Consolidate PCS register writing Prior to this patch, the driver would do this for each port: read 8-bit PCS write 8-bit PCS read 8-bit PCS write 8-bit PCS In the field, flaky behavior has been observed related to this register. In particular, these overzealous register writes can cause misdetection problems. Update to do the following once (not once per port) at boot: read 16-bit PCS if needs changing, write 16-bit PCS And thereafter, we only perform a 'read 16-bit PCS' per port. This should eliminate all PCS writes in many cases, and be more friendly in the cases where we do need to enable ports. Signed-off-by: Jeff Garzik commit d96715c1acb119cef4b2443ba9b3777b730139e6 Author: Tejun Heo Date: Thu Jun 29 01:58:28 2006 +0900 [PATCH] ata_piix: add host_set private structure Add host_set private structure piix_host_priv. Currently the only field is ->map which used to be stored directly at host_set->private_data. This change allows more host_set private fields to be added. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 284c5e6e938f79906f2ccc8c4039863e6c739aaa Author: Lennert Buytenhek Date: Sat Jul 15 21:08:07 2006 +0100 [ARM] 3730/1: ep93xx: enable usb ohci driver in the defconfig Patch from Lennert Buytenhek Since the ep93xx ohci bits are merged upstream now, enable ohci in the ep93xx defconfig. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 36902f2e35b132442746df6034462b7cdb7d82ab Author: Auke Kok Date: Fri Jul 14 16:14:55 2006 -0700 e1000: bump version to 7.1.9-k4 Bump the version to 7.1.9-k4 to indicate three extra changes. Signed-off-by: Auke Kok commit eb0f8054dd2e8b3cdf3af4771583b1dc2e1327cc Author: Auke Kok Date: Fri Jul 14 16:14:48 2006 -0700 e1000: fix panic on large frame receive when mtu=default A panic was reported when receiving 1522 size packets if using the default MTU. we should set the initial rx buffer length to the value that e1000changemtu sets so that we can receive any packet that would not be dropped by LPE=0. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit f235a2abb27b9396d2108dd2987fb8262cb508a3 Author: Auke Kok Date: Fri Jul 14 16:14:34 2006 -0700 e1000: remove CRC bytes from measured packet length After removing the hardware CRC stripping which causes problems with SOL and related issues, we need to compensate for this changed size. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit d3d9e484b2ca502c87156b69fa6b8f8fd5fa18a0 Author: Auke Kok Date: Fri Jul 14 16:14:23 2006 -0700 e1000: Redo netpoll fix to address community concerns The original suggested fix for netpoll was found to be racy on SMP kernels. While it is highly unlikely that this race would ever be seen in the real world due to current netpoll usage models, we implemented this updated fix to address concerns. Signed-off-by: Mitch Williams Signed-off-by: Auke Kok commit b1c495ffb3ee354a2e91bedc8b9e832cb7777043 Author: Russell King Date: Fri Jul 14 16:23:33 2006 +0100 [ARM] Fix cats build Fix more fallout from 894673ee6122a3ce1958e1fe096901ba5356a96b. arch/arm/mach-footbridge/cats-hw.c: In function 'fixup_cats': arch/arm/mach-footbridge/cats-hw.c:81: error: 'ORIG_VIDEO_LINES' undeclared (first use in this function) ... Signed-off-by: Russell King commit 79bd3f8563a275d1d068bbb9189a746dc6e96f3e Author: Christoph Hellwig Date: Fri Jul 14 10:29:34 2006 +0200 [SCSI] More buffer->request_buffer changes Seem like quite a few splipped through the cracks. Here's a patch to update all references I could find: Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 92c0bfea9ba61ec2d3a6d4fb1af39358d5e52b71 Author: Eric Moore Date: Tue Jul 11 17:34:43 2006 -0600 [SCSI] mptfusion: bump version to 3.04.01 bump version to 3.04.01 Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit ba856d32f2cede67fd2a59a53bc662360f17c7b5 Author: Eric Moore Date: Tue Jul 11 17:34:01 2006 -0600 [SCSI] mptfusion: misc fix's * removing obsolete 1066, 1066E from Kconfig * initializing aen_event_read_flag after host reset * remove oem references * remove obsolete mpt_pq_filter command line option Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 0ccdb007596642dae8d7b323127d8840939b844a Author: Eric Moore Date: Tue Jul 11 17:33:13 2006 -0600 [SCSI] mptfusion: firmware download boot fix's Fix's to insure download boot could occur when either channel of 1030 is reset. Necessary in order for onboard controller in flashless environment to become operational. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 3dc0b03fec73339199a995acd5a47478da0b4dc4 Author: Eric Moore Date: Tue Jul 11 17:32:33 2006 -0600 [SCSI] mptfusion: task abort fix's Fix's to insure proper status is returned to midlayer when a task abort failed to be aborted by controller firmware. Also sanity checks to prevent scsi cmd from being double completed during error recovery. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit bf4515227c36fde1887f3fc0afc25a9bb4726842 Author: Eric Moore Date: Tue Jul 11 17:25:35 2006 -0600 [SCSI] mptfusion: sas nexus loss support sas nexus loss support for systems that suport failover. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 4f766dc6d30ab0d958cbeafaeab5ed2538ec7015 Author: Eric Moore Date: Tue Jul 11 17:24:07 2006 -0600 [SCSI] mptfusion: sas loginfo update Adding more sas loginfo strings. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit d58b2725d28041ff9412fecb109bebf76b1a9b26 Author: Eric Moore Date: Tue Jul 11 17:23:23 2006 -0600 [SCSI] mptfusion: mptctl panic when loading Fix panic for when mptctl is loading at the same time when one of the fusion llds (mptsas/mptfc/mptspi) is loading. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 786899b013cdf7aeb2aaaf7390c442f02bba24af Author: Eric Moore Date: Tue Jul 11 17:22:22 2006 -0600 [SCSI] mptfusion: sas enclosures with smart drive Adding support for sas enclosures with smart drives. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 3bb056eb1df236f3344426860e584a8981486334 Author: James Bottomley Date: Wed Jul 12 11:55:39 2006 -0400 [SCSI] NCR_D700: misc fixes (section and argument ordering) Apparently the D700 has had an argument ordering issue for quite a while which can cause it to get the wrong scsi_id (I just got an unbootable voyager system because of this). Hopefully this patch also fixes up all the sectional mismatches within the driver. Signed-off-by: James Bottomley commit 6ecaff7fe84eb64796d8dfe667439290b4acfad0 Author: Randy Dunlap Date: Tue Jul 11 20:53:22 2006 -0700 [SCSI] scsi_debug: must_check fixes Check all __must_check warnings in scsi_debug. Signed-off-by: Randy Dunlap Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit e8bf39417b578a11e2ee2cd16e794a5b2d40757b Author: James Bottomley Date: Tue Jul 11 17:49:34 2006 -0400 [SCSI] scsi_transport_sas: kill the use of channel Using the port_id for the channel is completely unnecessary since the host_id/target_id are constructed to be globally unique. Also move the mptsas driver on to virtual channel 1 for its raid devices. Acked-by: "Moore, Eric" Signed-off-by: James Bottomley commit a0e1b6ef3b851fe6f1dcc259432e83de79ce5e7f Author: James Bottomley Date: Sun Jul 9 12:38:19 2006 -0500 [SCSI] scsi_transport_sas: add expander backlink This patch adds the ability to add a backlink to a particular port. The idea is to represent properly ports on expanders that are used specifically for linking to the parent device in the topology. Signed-off-by: James Bottomley commit 631c228cd09bd5b93090fa60bd9803ec14aa0586 Author: Christoph Hellwig Date: Sat Jul 8 20:42:15 2006 +0200 [SCSI] hide EH backup data outside the scsi_cmnd Currently struct scsi_cmnd has various fields that are used to backup original data after the corresponding fields have been overridden for EH commands. This means drivers can easily get at it and misuse it. Due to the old_ naming this doesn't happen for most of them, but two that have different names have been used wrong a lot (see previous patch). Another downside is that they unessecarily bloat the scsi_cmnd size. This patch moves them onstack in scsi_send_eh_cmnd to fix those two issues aswell as allowing future EH fixes like moving the EH command submissions to use SG lists like everything else. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit ae0fda0cdf009731a33f031f86df8566f1977ffe Author: Dave C Boutcher Date: Thu Jul 6 22:08:49 2006 -0500 [SCSI] ibmvscsi: handle inactive SCSI target during probe Without this patch we register an interrupt with request_irq, but then return a bad return code from the module probe. Signed-off-by: James Bottomley commit 6c51fe10475eda9f5c535f337411e1ed0e6915b9 Author: Dave C Boutcher Date: Thu Jul 6 22:07:47 2006 -0500 [SCSI] ibmvscsi: allocate lpevents for ibmvscsi on iseries Allocate the correct number of lp events when running ibmvscsi on legacy iseries Signed-off-by: Dave Boutcher Signed-off-by: James Bottomley commit d14164316d48a4319d8da9dc24be8663b2472bae Author: Matthew Wilcox Date: Sat Jul 8 14:02:26 2006 -0600 [SCSI] aic7[9x]xx: Remove last vestiges of reverse_scan Remove last vestiges of the reverse_scan paramater from aic7xxx and aic79xx. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 5e13cdfa5ba94724d6ab11de26b3ec3c94b88b00 Author: Christoph Hellwig Date: Sat Jul 8 20:39:30 2006 +0200 [SCSI] aha152x: stop poking at saved scsi_cmnd members Stop poking into the old_ & co scsi_cmnd fields that should only be used in the EH code. Untested, but this is required to move ahead with the EH fixes. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 4e73ea7b02a8d2759b20ab52f13f40d5f5421044 Author: Luben Tuikov Date: Fri Jul 7 00:02:18 2006 -0700 [SCSI] st.c: Improve sense output Convert this: st0: Error with sense data: <6>st: Current: sense key: Illegal Request Additional sense: Invalid field in cdb To this: st0: Current: sense key: Illegal Request Additional sense: Invalid field in cdb Signed-off-by: Luben Tuikov Acked-by: Kai Makisara Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 035bff20bff2b6779ed3ad0a24a51a1a96828bc8 Author: James Smart Date: Thu Jul 6 15:50:58 2006 -0400 [SCSI] lpfc 8.1.7: Change version number to 8.1.7 Change version number to 8.1.7 Signed-off-by: James Smart Signed-off-by: James Bottomley commit 65a29c166fe331574880a375559405ac802b027a Author: James Smart Date: Thu Jul 6 15:50:50 2006 -0400 [SCSI] lpfc 8.1.7: Misc Fixes Misc Fixes: - Fix some sparse warnings - casts of address space - Fix handling of the adapter registration string. Each invocation was byteswapping, so every other adapter init attempt failed. - Correct comments and default value for the lpfc_max_luns parameter Signed-off-by: James Smart Signed-off-by: James Bottomley commit b4c026520ff0a4cb838a941bb0ed8996075e3d8c Author: James Smart Date: Thu Jul 6 15:50:43 2006 -0400 [SCSI] lpfc 8.1.7: Add lpfc_sli_flush_mbox_queue() function Add lpfc_sli_flush_mbox_queue() function and use it in lpfc_offline() call to avoid deadlock on thread block. Signed-off-by: James Smart Signed-off-by: James Bottomley commit ce8b3ce55bb0bd9318954efab0f714b088178978 Author: James Smart Date: Thu Jul 6 15:50:36 2006 -0400 [SCSI] lpfc 8.1.7: Correct the wait in attachment that delays for topology discovery Correct the wait in attachment that delays for topology discovery Signed-off-by: James Smart Signed-off-by: James Bottomley commit 5e0b43385559bfe78c1f80d71ec203effe244d9a Author: James Smart Date: Thu Jul 6 15:50:29 2006 -0400 [SCSI] lpfc 8.1.7: Remove depricated sysfs attribute board_online Remove depricated sysfs attribute board_online, as it's replaced by the new issue_reset attribute Signed-off-by: James Smart Signed-off-by: James Bottomley commit 40496f073ffe75c59414a7236f95ecbc49562596 Author: James Smart Date: Thu Jul 6 15:50:22 2006 -0400 [SCSI] lpfc 8.1.7: Adding new issue_reset sysfs attribute Adding new issue_reset sysfs attribute Signed-off-by: James Smart Signed-off-by: James Bottomley commit 420b630d6e9ff41dc3e2a2a2808b67907951e094 Author: James Smart Date: Thu Jul 6 15:50:16 2006 -0400 [SCSI] lpfc 8.1.7: Fix panic in lpfc_sli_validate_fcp_iocb Fix panic in lpfc_sli_validate_fcp_iocb due to access of scsi_cmnd after returning it to the midlayer Signed-off-by: James Smart Signed-off-by: James Bottomley commit bcf4dbfaf38502d3919e0601c06afac7d5e42685 Author: James Smart Date: Thu Jul 6 15:50:08 2006 -0400 [SCSI] lpfc 8.1.7: Consolidate dma buf cleanup into a separate function Consolidate dma buf cleanup into a separate function Signed-off-by: James Smart Signed-off-by: James Bottomley commit 9279565046f39f3ab338818c9923a23b9f25be5f Author: James Smart Date: Thu Jul 6 15:50:02 2006 -0400 [SCSI] lpfc 8.1.7: Correct bogus nodev_tmo message on NPort that changes its NPort Id Correct bogus nodev_tmo message on NPort that changes its NPort Id Signed-off-by: James Smart Signed-off-by: James Bottomley commit 688a88635f9d0d9251d35198e931eaac8816abef Author: James Smart Date: Thu Jul 6 15:49:56 2006 -0400 [SCSI] lpfc 8.1.7: Fix txcmplq related panics on heavy IO while downloading firmware Fix txcmplq related panics on heavy IO while downloading firmware Signed-off-by: James Smart Signed-off-by: James Bottomley commit 4db621e0f3817e14c79513b42c0479d44d8467de Author: James Smart Date: Thu Jul 6 15:49:49 2006 -0400 [SCSI] lpfc 8.1.7: Issue DOWN_LINK prior to INIT_LINK to work around link failure issue Issue DOWN_LINK prior to INIT_LINK to work around link failure issue Signed-off-by: James Smart Signed-off-by: James Bottomley commit d0e56dad5c10e2a34a830e02dfd3aca20e63e387 Author: James Smart Date: Thu Jul 6 15:49:42 2006 -0400 [SCSI] lpfc 8.1.7: Fixed infinite retry of REG_LOGIN mailbox failed due to MBXERR_RPI_FULL Fixed infinite retry of REG_LOGIN mailbox failed due to MBXERR_RPI_FULL Signed-off-by: James Smart Signed-off-by: James Bottomley commit 9f49d3b05f092b89e774be20c654ceb0c64a7d19 Author: James Smart Date: Thu Jul 6 15:49:34 2006 -0400 [SCSI] lpfc 8.1.7: Fix memory leak and cleanup code related to per ring lookup array Fix memory leak and cleanup code related to per ring lookup array. Signed-off-by: James Smart Signed-off-by: James Bottomley commit e17da18e2f78845899467d6e580146ef673f5330 Author: James Smart Date: Thu Jul 6 15:49:25 2006 -0400 [SCSI] lpfc 8.1.7: Standardize the driver on a single define for the maximum supported targets Standardize the driver on a single define for the maximum supported targets. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 5a0e326dfa6d87a1ac6929a7d6d327e8803b7aef Author: James Smart Date: Thu Jul 6 15:49:16 2006 -0400 [SCSI] lpfc 8.1.7: Use mod_timer instead of add_timer in lpfc_els_timeout_handler Use mod_timer instead of add_timer in lpfc_els_timeout_handler This patch was formerly posted by Mark Haverkamp. http://marc.theaimsgroup.com/?l=linux-scsi&m=114246089015681&w=2 Signed-off-by: Mark Haverkamp Signed-off-by: James Smart Signed-off-by: James Bottomley commit dc22f16d4e46cee699c3835cc6e2a8005023517f Author: Eric Moore Date: Thu Jul 6 11:23:14 2006 -0600 [SCSI] mptsas: use unnumbered port API and remove driver porttracking This allows us to be rid of the machinery in mptsas for creating and tracking port numbers. Since mptsas is merely inventing the numbers, the SAS transport class may as well do it instead. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit a507c6a2d91c52615bd3bb5a8ff439d9e8530939 Author: Douglas Gilbert Date: Sun Jul 2 13:48:10 2006 -0400 [SCSI] update additional sense codes and some opcode names Following on from my post titled: "additional sense codes need update" see the attachment against lk 2.6.17 . ChangeLog: - update additional sense codes table to agree with SPC-4 revision 5a (14 June 2006) - adjust some of the opcode names Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit c9fefeb26457b87f4a767faefcf77321bb90db52 Author: James Bottomley Date: Sun Jul 2 11:10:18 2006 -0500 [SCSI] scsi_transport_sas: add unindexed ports Some SAS HBAs don't want to go to the trouble of tracking port numbers, so they'd simply like to say "add this port and give it a number". This is especially beneficial from the hotplug point of view, since tracking ports and the available number space can be a real pain. The current implementation uses an incrementing number per expander to add the port on. However, since there can never be more ports than there are phys, a later implementation will try to be more intelligent about this. Signed-off-by: James Bottomley commit 24f6d2fd314f8580fcfd96391ce9689727d55572 Author: Adrian Bunk Date: Fri Jun 30 02:33:07 2006 -0700 [SCSI] aic79xx: make ahd_done_with_status() static This patch makes a needlessly global function static. Signed-off-by: Adrian Bunk Acked-by: Hannes Reinecke Signed-off-by: Andrew Morton Signed-off-by: James Bottomley