commit a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e tree a87b764e94d4ca3f787b076e3f731a67ff68ee71 parent 679c0cd2dd61c825ab910fdbf347a8b7d1dddec4 author Stefan Richter Mon, 15 May 2006 22:09:46 +0200 committer Linus Torvalds Wed, 17 May 2006 21:32:22 -0700 [PATCH] ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices Re-enable posted writes for status FIFO. Besides bringing back a very minor bandwidth tweak from Linux 2.6.15.x and older, this also fixes an interoperability regression since 2.6.16: http://bugzilla.kernel.org/show_bug.cgi?id=6356 (sbp2: scsi_add_device failed. IEEE1394 HD is not working anymore.) Signed-off-by: Stefan Richter Tested-by: Vanei Heidemann Tested-by: Martin Putzlocher (chip type unconfirmed) Signed-off-by: Linus Torvalds commit 679c0cd2dd61c825ab910fdbf347a8b7d1dddec4 tree 01fc830a4e2e799de61afdb986d0a6c3d5270841 parent e9a1c52c7b19d10342226c12f170d7ab644427e2 author Stefan Richter Mon, 15 May 2006 22:08:09 +0200 committer Linus Torvalds Wed, 17 May 2006 21:32:22 -0700 [PATCH] sbp2: add ability to override hardwired blacklist In case the blacklist with workarounds for device bugs yields a false positive, the module load parameter can now also be used as an override instead of an addition to the blacklist. Signed-off-by: Stefan Richter Signed-off-by: Linus Torvalds commit e9a1c52c7b19d10342226c12f170d7ab644427e2 tree 231d00c761444c650e527d048aab0776bd135fb5 parent 24d3bf884e093f9de52d31c97187f4b9b4ad7dcb author Stefan Richter Mon, 15 May 2006 22:06:37 +0200 committer Linus Torvalds Wed, 17 May 2006 21:32:21 -0700 [PATCH] sbp2: add read_capacity workaround for iPod Apple decided to copy some USB stupidity over to FireWire. The sector number returned by iPods from read_capacity is one too many. This may cause I/O errors, especially if the kernel is configured for EFI partition support. We use the same workaround as usb-storage but have to check for different model IDs. http://marc.theaimsgroup.com/?t=114233262300001 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=187409 Acknowledgements: Diagnosis and therapy by Mathieu Chouquet-Stringer , additional data about affected and unaffected Apple hardware from Vladimir Kotal, Sander De Graaf, Bryan Olmstead and Hugh Dixon. Signed-off-by: Stefan Richter Signed-off-by: Linus Torvalds commit 24d3bf884e093f9de52d31c97187f4b9b4ad7dcb tree 3580e6023f813b1167df65be37298c278434b2d7 parent cb46c3701fb7b738de1e22ac4f2d06d18f547a74 author Stefan Richter Mon, 15 May 2006 22:04:59 +0200 committer Linus Torvalds Wed, 17 May 2006 21:32:21 -0700 [PATCH] sbp2: consolidate workarounds Grand unification of the three types of workarounds we have so far. The "skip mode page 8" workaround is now limited to devices which pretend to be of TYPE_DISK instead of TYPE_RBC. This workaround is no longer enabled for Initio bridges. Patch update in anticipation of more workarounds: - Add module parameter "workarounds". - Deprecate parameter "force_inquiry_hack". - Compose the blacklist of a compound type for better readability and extensibility. - Remove a now unused #define. Signed-off-by: Stefan Richter Signed-off-by: Linus Torvalds commit cb46c3701fb7b738de1e22ac4f2d06d18f547a74 tree 7d8740ed7849d31eaea19e696a4ea098ba151a96 parent 9676489866a75fdd56b0d3e40ec7884298bb1338 parent 8872d8e1c4311dd7e5086975df9c76120a0be83b author Linus Torvalds Wed, 17 May 2006 16:30:31 -0700 committer Linus Torvalds Wed, 17 May 2006 16:30:31 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TCP]: reno sacked_out count fix [IPV6]: Endian fix in net/ipv6/netfilter/ip6t_eui64.c:match(). [TR]: Remove an unused export. [IPX]: Correct return type of ipx_map_frame_type(). [IPX]: Correct argument type of ipxrtr_delete(). [PKT_SCHED]: Potential jiffy wrap bug in dev_watchdog(). commit 9676489866a75fdd56b0d3e40ec7884298bb1338 tree 75cbfb35f4e09ad15b8753191b566d401d86de56 parent 15eb7105a74a0a5d72d006fec2192b0ec692b5cc parent 843a46f423a508b3a443a08baa903c6da02f3297 author Linus Torvalds Wed, 17 May 2006 16:13:25 -0700 committer Linus Torvalds Wed, 17 May 2006 16:13:25 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6: sky2: prevent dual port receiver problems x86_64: Check for bad dma address in b44 1GB DMA workaround The ixp2000 driver for the enp2611 was developed on a board with commit 15eb7105a74a0a5d72d006fec2192b0ec692b5cc tree b774ed6e13751f590038c1d0454436326339cd62 parent a5d1792847172077d173c959c37d4562b9ec69e6 parent cef0893dcf1fdf22943aa49e75ee1eb3bfffe5f5 author Linus Torvalds Wed, 17 May 2006 16:11:41 -0700 committer Linus Torvalds Wed, 17 May 2006 16:11:41 -0700 Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 * 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2: configfs: Make sure configfs_init() is called before consumers. configfs: configfs_mkdir() failed to cleanup linkage. configfs: Fix a reference leak in configfs_mkdir(). ocfs2: fix gfp mask in some file system paths ocfs2: Don't populate uptodate cache in ocfs2_force_read_journal() ocfs2: take meta data lock in ocfs2_file_aio_read() ocfs2: take data locks around extend commit cef0893dcf1fdf22943aa49e75ee1eb3bfffe5f5 tree 13d7116b336bf935dafe70a732395c5c1fd03be3 parent eed7a0db460595b139428d252798a83f1e1ce1d3 author Joel Becker Wed, 03 May 2006 11:38:53 -0700 committer Mark Fasheh Wed, 17 May 2006 14:38:51 -0700 configfs: Make sure configfs_init() is called before consumers. configfs_init() needs to be called first to register configfs before anyconsumers try to access it. Move up configfs in fs/Makefile to make sure it is initialized early. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit eed7a0db460595b139428d252798a83f1e1ce1d3 tree 129db180cb8bac9810b6168802914c5ae2f619a3 parent 84efad1a53dd05969094f9a2562b4e6666571c00 author Joel Becker Tue, 11 Apr 2006 21:37:20 -0700 committer Mark Fasheh Wed, 17 May 2006 14:38:51 -0700 configfs: configfs_mkdir() failed to cleanup linkage. If configfs_mkdir() errored in certain ways after the parent<->child linkage was already created, it would not undo the linkage. Also, comment the reference counting for clarity. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 84efad1a53dd05969094f9a2562b4e6666571c00 tree 15ddfe0250f5d59d56e989cd89c682096139c1f5 parent afae00ab45ea71d89086f924ebee6ca51c81e48e author Joel Becker Mon, 27 Mar 2006 18:46:09 -0800 committer Mark Fasheh Wed, 17 May 2006 14:38:50 -0700 configfs: Fix a reference leak in configfs_mkdir(). configfs_mkdir() failed to release the working parent reference in most exit paths. Also changed the exit path for readability. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit afae00ab45ea71d89086f924ebee6ca51c81e48e tree 1306e519591e2dabb4376f52e34e515b343be4ad parent dd4a2c2bfe159cc39e9672e875c8314563699764 author Sunil Mushran Wed, 12 Apr 2006 14:37:00 -0700 committer Mark Fasheh Wed, 17 May 2006 14:38:49 -0700 ocfs2: fix gfp mask in some file system paths We were using GFP_KERNEL in a handful of places which really wanted GFP_NOFS. Fix this. Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit dd4a2c2bfe159cc39e9672e875c8314563699764 tree d858215c972c637000e2a28af85830fd4665cd89 parent c4374f8a6093fbee42ac4368b3ca180d1d0c7c6d author Mark Fasheh Wed, 12 Apr 2006 14:24:05 -0700 committer Mark Fasheh Wed, 17 May 2006 14:38:48 -0700 ocfs2: Don't populate uptodate cache in ocfs2_force_read_journal() This greatly reduces the amount of memory useded during recovery. Signed-off-by: Mark Fasheh commit c4374f8a6093fbee42ac4368b3ca180d1d0c7c6d tree 6e52cb1f85a5e769bd9f23e0e59d266767e25dcf parent 53013cba4118a5cfe8f7c7ea5e5bc1c48b160f76 author Mark Fasheh Fri, 05 May 2006 19:04:35 -0700 committer Mark Fasheh Wed, 17 May 2006 14:38:47 -0700 ocfs2: take meta data lock in ocfs2_file_aio_read() Temporarily take the meta data lock in ocfs2_file_aio_read() to allow us to update our inode fields. Signed-off-by: Mark Fasheh commit 53013cba4118a5cfe8f7c7ea5e5bc1c48b160f76 tree 5170ed12fbe07b5e8557e61952aa27c25034bd7a parent 0c056c50a6218e0e577817c16ba8851af593d742 author Mark Fasheh Fri, 05 May 2006 19:04:03 -0700 committer Mark Fasheh Wed, 17 May 2006 14:38:47 -0700 ocfs2: take data locks around extend We need to take a data lock around extends to protect the pages that ocfs2_zero_extend is going to be pulling into the page cache. Otherwise an extend on one node might populate the page cache with data pages that have no lock coverage. Signed-off-by: Mark Fasheh commit a5d1792847172077d173c959c37d4562b9ec69e6 tree 8ba84daea4d3e0cb4396d08cd9264fff327b0c69 parent 0c056c50a6218e0e577817c16ba8851af593d742 parent 4c31ce8fea9760961a2d1b1d6c84b7590c17ae38 author Linus Torvalds Wed, 17 May 2006 14:28:57 -0700 committer Linus Torvalds Wed, 17 May 2006 14:28:57 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] one-line cleanup on set_irq_affinity_info [IA64] fix broken irq affinity [IA64] sn2 defconfig commit 4c31ce8fea9760961a2d1b1d6c84b7590c17ae38 tree f18228706ac73a3ddb9fa9a88329a8ffe629bf89 parent 41503def5d83bada6a2fd792e636ccc28a285f38 author Chen, Kenneth W Tue, 16 May 2006 16:34:57 -0700 committer Tony Luck Wed, 17 May 2006 06:20:59 -0700 [IA64] one-line cleanup on set_irq_affinity_info Calls to set_irq_info in set_irq_affinity_info() is redundant because irq_affinity mask was set just one line immediately above it. Remove that duplicate call. Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit 41503def5d83bada6a2fd792e636ccc28a285f38 tree 4f2c602db9cf66232001baa3be9f5952b8a50266 parent 1101ece44e00cfe31a2fd9d3222d05f927b00ef8 author Chen, Kenneth W Tue, 16 May 2006 16:29:00 -0700 committer Tony Luck Wed, 17 May 2006 06:20:23 -0700 [IA64] fix broken irq affinity When CONFIG_PCI_MSI is set, move_irq() is an empty function, causing grief when sys admin tries to bind interrupt to CPU. Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit 1101ece44e00cfe31a2fd9d3222d05f927b00ef8 tree 3160a56cf83405fee56d6f764bd396e05b2cac70 parent c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 author Jes Sorensen Mon, 15 May 2006 05:07:54 -0400 committer Tony Luck Wed, 17 May 2006 06:18:56 -0700 [IA64] sn2 defconfig Set node shift to 10 on SN2 and disable mutex debugging. Signed-off-by: Jes Sorensen Signed-off-by: Tony Luck commit 8872d8e1c4311dd7e5086975df9c76120a0be83b tree 1486697e32c65521785721fe9523f4eaee9a3e90 parent d8fd0a73169e90022dc3ccf3083ca24573b44b5c author Angelo P. Castellani Tue, 16 May 2006 21:42:11 -0700 committer David S. Miller Tue, 16 May 2006 21:42:11 -0700 [TCP]: reno sacked_out count fix From: "Angelo P. Castellani" Using NewReno, if a sk_buff is timed out and is accounted as lost_out, it should also be removed from the sacked_out. This is necessary because recovery using NewReno fast retransmit could take up to a lot RTTs and the sk_buff RTO can expire without actually being really lost. left_out = sacked_out + lost_out in_flight = packets_out - left_out + retrans_out Using NewReno without this patch, on very large network losses, left_out becames bigger than packets_out + retrans_out (!!). For this reason unsigned integer in_flight overflows to 2^32 - something. Signed-off-by: David S. Miller commit d8fd0a73169e90022dc3ccf3083ca24573b44b5c tree 0147645272a7d86fcfe102b9ce694ebe7f8bcc03 parent 6599519e9c6c56ff0f9a4ffd53f90c5b65b902f4 author Alexey Dobriyan Tue, 16 May 2006 15:24:41 -0700 committer David S. Miller Tue, 16 May 2006 15:24:41 -0700 [IPV6]: Endian fix in net/ipv6/netfilter/ip6t_eui64.c:match(). Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 6599519e9c6c56ff0f9a4ffd53f90c5b65b902f4 tree ea393e5e8c5f13afa5b0adb77b89d7eaac85d4c5 parent 4ac396c0467993853d3d58c0975151515700c07b author Adrian Bunk Tue, 16 May 2006 15:23:40 -0700 committer David S. Miller Tue, 16 May 2006 15:23:40 -0700 [TR]: Remove an unused export. This patch removes the unused EXPORT_SYMBOL(tr_source_route). (Note, the usage in net/llc/llc_output.c can't be modular.) Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 0c056c50a6218e0e577817c16ba8851af593d742 tree feabddbd93b49ce94103c6054336078f240848ee parent 4fbca5320eb102d2e15bdeffe79e125c11cf925e parent 1e316d7566b63767aa18902235c719e9e95465d0 author Linus Torvalds Tue, 16 May 2006 15:18:26 -0700 committer Linus Torvalds Tue, 16 May 2006 15:18:26 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6: [PATCH] SPI: spi_bitbang: clocking fixes [PATCH] spi: Update to PXA2xx SPI Driver [PATCH] SPI: busnum == 0 needs to work [PATCH] SPI: devices can require LSB-first encodings [PATCH] SPI: Renamed bitbang_transfer_setup to spi_bitbang_setup_transfer and export it [PATCH] SPI: Add David as the SPI subsystem maintainer [PATCH] SPI: spi bounce buffer has a minimum length [PATCH] SPI: spi whitespace fixes [PATCH] SPI: add PXA2xx SSP SPI Driver [PATCH] SPI: per-transfer overrides for wordsize and clocking commit 4ac396c0467993853d3d58c0975151515700c07b tree fb52e9578201b027ffba0292199c9acd2c4720d8 parent 53d42f541278b6c97724465b19bae4730d7a85c8 author Alexey Dobriyan Tue, 16 May 2006 15:17:49 -0700 committer David S. Miller Tue, 16 May 2006 15:17:49 -0700 [IPX]: Correct return type of ipx_map_frame_type(). Casting BE16 to int and back may or may not work. Correct, to be sure. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 4fbca5320eb102d2e15bdeffe79e125c11cf925e tree 59111c77d71bbdf557bbc30e31f5f3235ae0498c parent 509b70b677ca35a0e800807c6470181df5008d70 parent 3170a5e80be7db29ab5ccb6b4145cf28b4a156de author Linus Torvalds Tue, 16 May 2006 15:16:14 -0700 committer Linus Torvalds Tue, 16 May 2006 15:16:14 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] arch/arm/kernel/dma-isa.c: named initializers [ARM] 3527/1: MPCore Boot Lockup Fix [ARM] arch/arm/kernel/process.c: Fix warning [ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM [ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h commit 509b70b677ca35a0e800807c6470181df5008d70 tree a877b27154b0ce0aab10a1d76106a32f4701f456 parent 716f8954fb3029ca2df52a986b60af8d06f093ee parent 1281e36027a9119356bd93b5e7853c72c35dd462 author Linus Torvalds Tue, 16 May 2006 15:15:59 -0700 committer Linus Torvalds Tue, 16 May 2006 15:15:59 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial * master.kernel.org:/home/rmk/linux-2.6-serial: [ARM] 3523/1: Serial core pm_state commit 53d42f541278b6c97724465b19bae4730d7a85c8 tree cf974cb6debb01c7b54d53b0106a001941460a22 parent 338f7566e5c26a9547e25d54863ae4e4e5c856d1 author Alexey Dobriyan Tue, 16 May 2006 15:07:28 -0700 committer David S. Miller Tue, 16 May 2006 15:07:28 -0700 [IPX]: Correct argument type of ipxrtr_delete(). A single caller passes __u32. Inside function "net" is compared with __u32 (__be32 really, just wasn't annotated). Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 338f7566e5c26a9547e25d54863ae4e4e5c856d1 tree fbe483e07f8680a7718e02b869cdf5e042e2ec7b parent 716f8954fb3029ca2df52a986b60af8d06f093ee author Stephen Hemminger Tue, 16 May 2006 15:02:12 -0700 committer David S. Miller Tue, 16 May 2006 15:02:12 -0700 [PKT_SCHED]: Potential jiffy wrap bug in dev_watchdog(). There is a potential jiffy wraparound bug in the transmit watchdog that is easily avoided by using time_after(). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 1e316d7566b63767aa18902235c719e9e95465d0 tree 506783a779e1b06b20de0bc03e4b0008f77704e8 parent 9708c121c38fe864eb6f5a119f7525729686e095 author David Brownell Thu, 06 Apr 2006 22:25:56 -0700 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:58 -0700 [PATCH] SPI: spi_bitbang: clocking fixes This fixes two problems triggered by the MMC stack updating clocks: - SPI masters driver should accept a max clock speed of zero; that's one convention for marking idle devices. (Presumably that helps controllers that don't autogate clocks to "off" when not in use.) - There are more than 1000 nanoseconds per millisecond; setting the clock down to 125 KHz now works properly. Showing once again that Zero (http://en.wikipedia.org/wiki/Zero) is still an inexhaustible number of bugs. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 9708c121c38fe864eb6f5a119f7525729686e095 tree 27d5afdcafdcf10b45f4a228c739d5819cc9240c parent a020ed7521a9737bcf3e34eb880867c60c3c68d0 author Stephen Street Tue, 28 Mar 2006 14:05:23 -0800 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:58 -0700 [PATCH] spi: Update to PXA2xx SPI Driver Fix two outstanding issues with the pxa2xx_spi driver: 1) Bad cast in the function u32_writer. Thanks to Henrik Bechmann 2) Adds support for per transfer changes to speed and bits per word Signed-off-by: Stephen Street Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit a020ed7521a9737bcf3e34eb880867c60c3c68d0 tree 52941e00b05df6c1bfe228fd193fdb09cf963d15 parent ccf77cc4af5b048e20cfd9327fcc286cb69c34cc author David Brownell Mon, 03 Apr 2006 15:49:04 -0700 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:57 -0700 [PATCH] SPI: busnum == 0 needs to work We need to be able to have a "SPI bus 0" matching chip numbering; but that number was wrongly used to flag dynamic allocation of a bus number. This patch resolves that issue; now negative numbers trigger dynamic alloc. It also updates the how-to-write-a-controller-driver overview to mention this stuff. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit ccf77cc4af5b048e20cfd9327fcc286cb69c34cc tree 0a19a6948fe8bbf2128010a655e170ffebc9d8b8 parent ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b author David Brownell Mon, 03 Apr 2006 15:46:22 -0700 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:57 -0700 [PATCH] SPI: devices can require LSB-first encodings Add spi_device hook for LSB-first word encoding, and update all the (in-tree) controller drivers to reject such devices. Eventually, some controller drivers will be updated to support lsb-first encodings on the wire; no current drivers need this. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b tree 2d487a384f075f82444135a77330755f1755aa16 parent 025c398710ac24456f0288fc7e64f426c5c5508f author Kumar Gala Sun, 02 Apr 2006 16:06:35 -0500 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:57 -0700 [PATCH] SPI: Renamed bitbang_transfer_setup to spi_bitbang_setup_transfer and export it Renamed bitbang_transfer_setup to follow convention of other exported symbols from spi-bitbang. Exported spi_bitbang_setup_transfer to allow users of spi-bitbang to use the function in their own setup_transfer. Signed-off-by: Kumar Gala Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 025c398710ac24456f0288fc7e64f426c5c5508f tree 53863cd918bc5d0980d2f5bf0b71594fa9ed2f3a parent a9948b6194b46e489aa3b4d111d6dfd786c39c4b author Kumar Gala Sun, 02 Apr 2006 16:05:54 -0500 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:57 -0700 [PATCH] SPI: Add David as the SPI subsystem maintainer Add David as the SPI subsystem maintainer Signed-off-by: Kumar Gala Signed-off-by: Greg Kroah-Hartman commit a9948b6194b46e489aa3b4d111d6dfd786c39c4b tree 28f4984be0547c773ad24ef6ed882f1ae9cbede8 parent 747d844ee9a183ff3067bb1181f2a25c50649538 author David Brownell Sun, 02 Apr 2006 10:37:40 -0800 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:57 -0700 [PATCH] SPI: spi bounce buffer has a minimum length Make sure that spi_write_then_read() can always handle at least 32 bytes of transfer (total, both directions), minimizing one portability issue. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 747d844ee9a183ff3067bb1181f2a25c50649538 tree 0d35d9c2e3267765f328d7371b23433a5c7709c9 parent e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 author David Brownell Sun, 02 Apr 2006 10:33:37 -0800 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:56 -0700 [PATCH] SPI: spi whitespace fixes This removes superfluous whitespace in the header. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 tree 7752a74a70b6e174f347f1d56ab98717e9e93b61 parent 4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa author Stephen Street Tue, 07 Mar 2006 23:53:24 -0800 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:56 -0700 [PATCH] SPI: add PXA2xx SSP SPI Driver This driver turns a PXA2xx synchronous serial port (SSP) into a SPI master controller (see Documentation/spi/spi_summary). The driver has the following features: - Support for any PXA2xx SSP - SSP PIO and SSP DMA data transfers. - External and Internal (SSPFRM) chip selects. - Per slave device (chip) configuration. - Full suspend, freeze, resume support. Signed-off-by: Stephen Street Signed-off-by: Andrew Morton Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa tree 0ef6066c4f2c0225517a6402bb04f4b4d56afd4d parent 716f8954fb3029ca2df52a986b60af8d06f093ee author Imre Deak Fri, 17 Feb 2006 10:02:18 -0800 committer Greg Kroah-Hartman Tue, 16 May 2006 14:33:56 -0700 [PATCH] SPI: per-transfer overrides for wordsize and clocking Some protocols (like one for some bitmap displays) require different clock speed or word size settings for each transfer in an SPI message. This adds those parameters to struct spi_transfer. They are to be used when they are nonzero; otherwise the defaults from spi_device are to be used. The patch also adds a setup_transfer callback to spi_bitbang, uses it for messages that use those overrides, and implements it so that the pure bitbanging code can help resolve any questions about how it should work. Signed-off-by: Imre Deak Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 3170a5e80be7db29ab5ccb6b4145cf28b4a156de tree c9279a69bc34cd01568f506dd4f163fd350b3ea7 parent bb1a2aa617e67e2d60f22052b13422c7caeaf798 author Adrian Bunk Tue, 16 May 2006 22:09:46 +0100 committer Russell King Tue, 16 May 2006 22:09:46 +0100 [ARM] arch/arm/kernel/dma-isa.c: named initializers This patch converts struct dma_resources to named initializers. Besides fixing a compile error in -mm, it didn't sound like a bad idea. Signed-off-by: Adrian Bunk Acked-by: Alexander Schulz Signed-off-by: Russell King commit bb1a2aa617e67e2d60f22052b13422c7caeaf798 tree 01b34d62f8ec450c496bb090733d49695346442e parent 9d494ccb9ca297f80dc61a0d6357e88c86f44e92 author Harry Fearnhamm Tue, 16 May 2006 16:50:21 +0100 committer Russell King Tue, 16 May 2006 16:50:21 +0100 [ARM] 3527/1: MPCore Boot Lockup Fix Patch from Harry Fearnhamm This patch fixes the occasional lockup seen in early boot stage on RealView MPCore system. Signed-off-by: Harry Fearnhamm Signed-off-by: Russell King commit 716f8954fb3029ca2df52a986b60af8d06f093ee tree d5f983daab287e0a46ac2a76e78a13037b7ed9b6 parent a4523a8b38089478f93bc053c31f678c63f5ee1b parent cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 author Linus Torvalds Tue, 16 May 2006 08:46:10 -0700 committer Linus Torvalds Tue, 16 May 2006 08:46:10 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] Fix pSeries identification in prom_init.c [PATCH] powerpc: fix kernel version display on pseries boxes commit a4523a8b38089478f93bc053c31f678c63f5ee1b tree 96f828650d2234aac76fe39ea38b7c7250c49349 parent 40e59a61669a3cab9e0bd24644e29155d6b00970 author Roland Dreier Mon, 15 May 2006 11:41:00 -0700 committer Linus Torvalds Tue, 16 May 2006 07:59:32 -0700 [PATCH] slab: Fix kmem_cache_destroy() on NUMA With CONFIG_NUMA set, kmem_cache_destroy() may fail and say "Can't free all objects." The problem is caused by sequences such as the following (suppose we are on a NUMA machine with two nodes, 0 and 1): * Allocate an object from cache on node 0. * Free the object on node 1. The object is put into node 1's alien array_cache for node 0. * Call kmem_cache_destroy(), which ultimately ends up in __cache_shrink(). * __cache_shrink() does drain_cpu_caches(), which loops through all nodes. For each node it drains the shared array_cache and then handles the alien array_cache for the other node. However this means that node 0's shared array_cache will be drained, and then node 1 will move the contents of its alien[0] array_cache into that same shared array_cache. node 0's shared array_cache is never looked at again, so the objects left there will appear to be in use when __cache_shrink() calls __node_shrink() for node 0. So __node_shrink() will return 1 and kmem_cache_destroy() will fail. This patch fixes this by having drain_cpu_caches() do drain_alien_cache() on every node before it does drain_array() on the nodes' shared array_caches. The problem was originally reported by Or Gerlitz . Signed-off-by: Roland Dreier Acked-by: Christoph Lameter Acked-by: Pekka Enberg Signed-off-by: Linus Torvalds commit 40e59a61669a3cab9e0bd24644e29155d6b00970 tree 25db313781596303562a1a316592ffb9ff96542b parent fad7906d16e8c4926aeb5b0f1756eb9f55b2837d author Andi Kleen Mon, 15 May 2006 18:19:47 +0200 committer Linus Torvalds Tue, 16 May 2006 07:59:32 -0700 [PATCH] x86_64: Don't schedule on exception stack on preemptive kernels Extends an earlier patch from John Blackwood to more exception handlers that also run on the exception stacks. Expand the use of preempt_conditional_{sti,cli} to all cases where interrupts are to be re-enabled during exception handling while running on an IST stack. Based on original patch from Jan Beulich. Cc: John Blackwood Cc: jbeulich@novell.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fad7906d16e8c4926aeb5b0f1756eb9f55b2837d tree 1a238328b29316e3aa8d8fa9f05dedcf1d58c153 parent 5491d0f3e206beb95eeb506510d62a1dab462df1 author Andi Kleen Mon, 15 May 2006 18:19:44 +0200 committer Linus Torvalds Tue, 16 May 2006 07:59:31 -0700 [PATCH] x86_64: Fix memory hotadd heuristics This fixes some boot failures on Dell and Unisys systems with memory hotadd added. - Set hotadd_percent to 0 by default. This means anybody using hotadd memory needs to specify the value on the command line. That's because there are lots of Intel boxes which have a bogus hotplug area in their SRAT and they would waste a lot of memory before. - Fix calculation of how much memory to use when the hotplug area exceeds hotadd_percent - Fix fallback when the - Fix fallback if memory hotadd is not compiled in. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5491d0f3e206beb95eeb506510d62a1dab462df1 tree 5c4aadcfb4a93535e2f6e0f5977e930ccacec0e9 parent f0fdabf8bf187c9aafeb139a828c530ef45cf022 author Andi Kleen Mon, 15 May 2006 18:19:41 +0200 committer Linus Torvalds Tue, 16 May 2006 07:59:31 -0700 [PATCH] i386/x86_64: Force pci=noacpi on HP XW9300 This is needed to see all devices. The system has multiple PCI segments and we don't handle that properly yet in PCI and ACPI. Short term before this is fixed blacklist it to pci=noacpi. Acked-by: len.brown@intel.com Cc: gregkh@suse.de Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f0fdabf8bf187c9aafeb139a828c530ef45cf022 tree d445ab6a41a30633e335938164698bfc6152a8ad parent 639b421b911bbde1e3fb5ed037a4f8c85a5bffcb author Andi Kleen Mon, 15 May 2006 18:19:38 +0200 committer Linus Torvalds Tue, 16 May 2006 07:59:31 -0700 [PATCH] x86_64: Don't warn for overflow in nommu case when dma_mask is < 32bit This triggers for b44's 1GB DMA workaround which tries to map first and then bounces. The 32bit heuristic is reasonable because the IOMMU doesn't attempt to handle < 32bit masks anyways. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 639b421b911bbde1e3fb5ed037a4f8c85a5bffcb tree 31522e82cffe76cc13bd2f6db68d74bcbd526f53 parent c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 author Andi Kleen Mon, 15 May 2006 18:19:35 +0200 committer Linus Torvalds Tue, 16 May 2006 07:59:31 -0700 [PATCH] x86_64: Check for bad dma address in b44 1GB DMA workaround Needed for interaction with the nommu code in x86-64 which will return bad_dma_address if the address exceeds dma_mask. Cc: netdev@vger.kernel.org Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 tree 71d42f762163a309e804193efd3f0674c3e57dbb parent 3de620e8394406fd01f450b8c6e3e74464e81a78 author Benjamin Herrenschmidt Mon, 15 May 2006 15:46:03 +1000 committer Paul Mackerras Tue, 16 May 2006 21:31:25 +1000 [PATCH] Fix pSeries identification in prom_init.c The OF trampoline code prom_init.c still needs to identify IBM pSeries (PAPR) machines in order to run some platform specific code on them like instanciating the TCE tables. The code doing that detection was changed recently in 2.6.17 early stages but was done slightly incorrectly. It should be testing for an exact match of "chrp" and it currently tests for anything that begins with "chrp". That means it will incorrectly match with platforms using Maple-like device-trees and have open firmware. This fixes it by using strcmp instead of strncmp to match what the actual platform detection code does. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 3de620e8394406fd01f450b8c6e3e74464e81a78 tree 045a6604109bb566d5405998652c04954cac1725 parent c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 author Anton Blanchard Wed, 10 May 2006 13:05:54 +1000 committer Paul Mackerras Tue, 16 May 2006 21:30:57 +1000 [PATCH] powerpc: fix kernel version display on pseries boxes We are displaying the wrong thing on the operator panel (2x40 character LCD). This got broken in commit cebb21b5, when UTS_RELEASE got changed to system_utsname.version. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 9d494ccb9ca297f80dc61a0d6357e88c86f44e92 tree bff2835d78fb8cb3bdbab1cf9e235e52929e5653 parent 478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee author Russell King Tue, 16 May 2006 11:33:15 +0100 committer Russell King Tue, 16 May 2006 11:39:32 +0100 [ARM] arch/arm/kernel/process.c: Fix warning arch/arm/kernel/process.c:314: warning: assignment makes integer from pointer without a cast Signed-off-by: Russell King commit 478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee tree 827e2d2df5798a97f5aa401505dba88fee998ca3 parent 1d6760a3ac6b5691e4914a3333b48fee5c2e275d author Catalin Marinas Tue, 16 May 2006 11:30:26 +0100 committer Russell King Tue, 16 May 2006 11:39:31 +0100 [ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM Patch from Catalin Marinas This patch modifies the __ioremap_pfn and __iounmap functions in arch/arm/mm/ioremap.c to use vunmap instead of vfree. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 1d6760a3ac6b5691e4914a3333b48fee5c2e275d tree 02d0296c1155377e79b22760ca9cf9638b223425 parent 2ceec0c8c6e2780d58dece91b4b787729405d9e7 author Nicolas Pitre Tue, 16 May 2006 11:29:46 +0100 committer Russell King Tue, 16 May 2006 11:39:31 +0100 [ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes Patch from Nicolas Pitre Assembly code that calls C code must ensure the C code sees a 64-bit aligned stack pointer. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 2ceec0c8c6e2780d58dece91b4b787729405d9e7 tree 121c03865e0b8e6bc86161592ebeacb852727d04 parent c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 author Uwe Zeisberger Wed, 10 May 2006 18:11:05 +0100 committer Russell King Tue, 16 May 2006 11:39:30 +0100 [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h Patch from Uwe Zeisberger The symbol is only used in arch/arm/kernel/head-common.S. This in turn is included from arch/arm/kernel/head.S and arch/arm/kernel/head-nommu.S which include asm-offsets.h . Signed-off-by: Uwe Zeisberger Signed-off-by: Russell King commit 1281e36027a9119356bd93b5e7853c72c35dd462 tree c10b62b061a3a3f74a1e94ac539345ebaf8708ed parent c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 author Andrew Victor Tue, 16 May 2006 11:28:49 +0100 committer Russell King Tue, 16 May 2006 11:28:49 +0100 [ARM] 3523/1: Serial core pm_state Patch from Andrew Victor The serial_core already manages the power state of the UARTs, and therefore it shouldn't suspend a UART which was previously suspended. This patch modifies serial_core only call the UART-specific power-management function if the PM state is actually changing. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 843a46f423a508b3a443a08baa903c6da02f3297 tree 635b032413590677e32b968e4c301bac3d7af554 parent de54bc0f00c23a805f4ad2146c5a1fd5e2abe1e9 author Stephen Hemminger Thu, 11 May 2006 15:07:28 -0700 committer Stephen Hemminger Mon, 15 May 2006 12:35:01 -0700 sky2: prevent dual port receiver problems When both ports are receiving simultaneously, the receive logic gets confused and may pass up a packet before it is full. This causes hangs, and IP will see lots of garbage packets. There is even the potential for data corruption if a later arriving packet DMA's into freed memory. It looks like a hardware bug because status arrives for a packet but no data is there. Until this bug is worked out, block the user from bringing up both ports at once. Signed-off-by: Stephen Hemminger commit de54bc0f00c23a805f4ad2146c5a1fd5e2abe1e9 tree ded841bc40c3d5c63013c8f3a7bcc83c3d56ffdc parent 1ea739a5f9f469a57d804ebcf70514b8a5efe9da author Andi Kleen Mon, 15 May 2006 18:19:35 +0200 committer Stephen Hemminger Mon, 15 May 2006 12:26:00 -0700 x86_64: Check for bad dma address in b44 1GB DMA workaround Needed for interaction with the nommu code in x86-64 which will return bad_dma_address if the address exceeds dma_mask. Cc: netdev@vger.kernel.org Signed-off-by: Andi Kleen Signed-off-by: Stephen Hemminger commit 1ea739a5f9f469a57d804ebcf70514b8a5efe9da tree 48269d9f017b7f09eab3577ba78ed81ad9faa7f5 parent 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 author Lennert Buytenhek Mon, 15 May 2006 12:25:29 -0700 committer Stephen Hemminger Mon, 15 May 2006 12:25:29 -0700 The ixp2000 driver for the enp2611 was developed on a board with three gigabit ports, but some enp2611 models only have two ports (and only one onboard PM3386.) The current driver assumes there are always three ports and so it doesn't work on the two-port version of the board at all. This patch adds a bit of logic to the enp2611 driver to limit the number of ports to 2 if the second PM3386 isn't detected. Signed-off-by: Lennert Buytenhek Signed-off-by: Stephen Hemminger commit c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 tree f06021acf77cc63e869a0fb75348eec93f99c2c1 parent 194a61b8e09ac526c33777a688ee2a1504d7fbc3 author Andrew Morton Mon, 15 May 2006 09:44:43 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:58 -0700 [PATCH] dl2k needs dma-mapping.h On alpha: drivers/net/dl2k.c: In function `rio_free_tx': drivers/net/dl2k.c:768: error: `DMA_48BIT_MASK' undeclared (first use in this function) drivers/net/dl2k.c:768: error: (Each undeclared identifier is reported only once drivers/net/dl2k.c:768: error: for each function it appears in.) drivers/net/dl2k.c: In function `receive_packet': drivers/net/dl2k.c:896: error: `DMA_48BIT_MASK' undeclared (first use in this function) drivers/net/dl2k.c: In function `rio_close': drivers/net/dl2k.c:1803: error: `DMA_48BIT_MASK' undeclared (first use in this function) Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 194a61b8e09ac526c33777a688ee2a1504d7fbc3 tree 8319b7deca72b265317102ea0dfd5c9442f474ba parent d3779e7989cfdba854b843fe605f8df9e991cd18 author Andrew Morton Mon, 15 May 2006 09:44:42 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:58 -0700 [PATCH] jffs2 warning fixes fs/jffs2/nodelist.c: In function `check_node_data': fs/jffs2/nodelist.c:441: warning: unsigned int format, different type arg (arg 4) fs/jffs2/nodelist.c:464: warning: int format, different type arg (arg 5) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3779e7989cfdba854b843fe605f8df9e991cd18 tree b535626d492020e650c2014b44cc182f05353eac parent 264a341231e8af2c2e35ac15d26de76f1198525b author Peter Osterlund Mon, 15 May 2006 09:44:40 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:58 -0700 [PATCH] devices.txt: remove pktcdvd entry Changing the driver to use dynamic device numbers was one of the many changes that were made in order to have the driver accepted into the mainline kernel. Therefore I would say that the entry in devices.txt is obsolete. This patch removes it. Signed-off-by: Peter Osterlund Cc: Torben Mathiasen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 264a341231e8af2c2e35ac15d26de76f1198525b tree c86301f2a55057e29425731965d5fdea264494f8 parent 79afecfaabbe42e2a8a7e28880517f1721f2f3a7 author Thomas Kleffel Mon, 15 May 2006 09:44:37 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:58 -0700 [PATCH] ide_cs: Add IBM microdrive to known IDs Add the IBM microdrive to the known PCMCIA IDs for ide_cs. Signed-off-by: Thomas Kleffel Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79afecfaabbe42e2a8a7e28880517f1721f2f3a7 tree 26b577c7c882e1fec21e4dedb2c938bc742e8964 parent bfe2e9349f318883c036607c64b6205d573a28ff author Aneesh Kumar Mon, 15 May 2006 09:44:36 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:58 -0700 [PATCH] Fix typos in Documentation/memory-barriers.txt Fix some typos in Documentation/memory-barriers.txt Signed-off-by: Aneesh Kumar K.V Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfe2e9349f318883c036607c64b6205d573a28ff tree c1ea32e56a4346638867d3320834abc3f29f32e9 parent b2d596d8e08099b47e0a75aa4b7f82aae780e851 author Alexey Dobriyan Mon, 15 May 2006 09:44:35 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] gigaset: endian fix Signed-off-by: Alexey Dobriyan Cc: Hansjoerg Lipp Cc: Tilman Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2d596d8e08099b47e0a75aa4b7f82aae780e851 tree 5b76a8b0122e76564d98003425dbd06dff420230 parent ce007ea59729d627f62bb5fa8c1a81e25653a0ad author Pavel Machek Mon, 15 May 2006 09:44:34 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] fix hotplug kconfig help HOTPLUG_CPU entry says "Say Y..." then "Say N.". Slightly ugly, so I fixed it up, and added remark about suspend on SMP as a bonus. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce007ea59729d627f62bb5fa8c1a81e25653a0ad tree c09308c9da8b75462510fce1719ce4a29143964a parent eee391a66d774e644bf3cbb35403562e09d88bb2 author Carl-Daniel Hailfinger Mon, 15 May 2006 09:44:33 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] smbus unhiding kills thermal management Do not enable the SMBus device on Asus boards if suspend is used. We do not reenable the device on resume, leading to all sorts of undesirable effects, the worst being a total fan failure after resume on Samsung P35 laptop. Signed-off-by: Carl-Daniel Hailfinger Signed-off-by: Pavel Machek Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eee391a66d774e644bf3cbb35403562e09d88bb2 tree 1c04e7edb60a5c129c8e118decfea8b5ba5076a3 parent be6e028b6422878df2e799a74609a03a553c7dad author Andrew Morton Mon, 15 May 2006 09:44:30 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] revert "vfs: propagate mnt_flags into do_loopback/vfsmount" Revert commit f6422f17d3a480f21917a3895e2a46b968f56a08, due to Valdis.Kletnieks@vt.edu wrote: > > There seems to have been a bug introduced in this changeset: > > Am running 2.6.17-rc3-mm1. When this changeset is applied, 'mount --bind' > misbehaves: > > > # mkdir /foo > > # mount -t tmpfs -o rw,nosuid,nodev,noexec,noatime,nodiratime none /foo > > # mkdir /foo/bar > > # mount --bind /foo/bar /foo > > # tail -2 /proc/mounts > > none /foo tmpfs rw,nosuid,nodev,noexec,noatime,nodiratime 0 0 > > none /foo tmpfs rw 0 0 > > Reverting this changeset causes both mounts to have the same options. > > (Thanks to Stephen Smalley for tracking down the changeset...) > Cc: Herbert Poetzl Cc: Christoph Hellwig Cc: Cc: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be6e028b6422878df2e799a74609a03a553c7dad tree 8903854a9d6f82f3ec0b4e6087ff0fbad80578db parent 3835a9bd07778d87dea37fbf190f70883515e8fc author Andy Whitcroft Mon, 15 May 2006 09:44:29 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] root mount failure: emit filesystems attempted When we fail to mount from a valid root device list out the filesystems we have tried to mount it with. This gives the user vital diagnostics as to what is missing from their kernel. For example in the fragment below the kernel does not have CRAMFS compiled into the kernel and yet appears to recognise it at the RAMDISK detect stage. Later the mount fails as we don't have the filesystem. RAMDISK: cramfs filesystem found at block 0 RAMDISK: Loading 1604KiB [1 disk] into ram disk... done. XFS: bad magic number XFS: SB validate failed No filesystem could mount root, tried: reiserfs ext3 ext2 msdos vfat iso9660 jfs xfs Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(8,1) Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3835a9bd07778d87dea37fbf190f70883515e8fc tree e094973e46552335bb1ecaa9eaee04788df45b16 parent bb53a76116a8af13ee2581c85c02fe40e0c1a599 author Alexey Dobriyan Mon, 15 May 2006 09:44:27 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] fs/compat.c: fix 'if (a |= b )' typo Mentioned by Mark Armbrust somewhere on Usenet. Signed-off-by: Alexey Dobriyan Cc: David Woodhouse Cc: Ulrich Drepper Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb53a76116a8af13ee2581c85c02fe40e0c1a599 tree 1338b1488774d50aa8f6586c72a6e6b1400e3327 parent 655fdeab809a5612b0eab6aee873b00d26404ca7 author Daniel Walker Mon, 15 May 2006 09:44:27 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] tpm_register_hardware gcc 4.1 warning fix drivers/char/tpm/tpm.c: In function 'tpm_register_hardware': drivers/char/tpm/tpm.c:1157: warning: assignment from incompatible pointer type Signed-off-by: Daniel Walker Acked-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 655fdeab809a5612b0eab6aee873b00d26404ca7 tree 9aa5608c1ee21cf03abae11b8ae2f13c18d9c12c parent 2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 author Alan Cox Mon, 15 May 2006 09:44:26 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] Final rio polish Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 tree ff9daf3ca4ad802fe1c25adf40aa65d76d49b770 parent 64471ebe534dc6cedd72849b2324b52cb5249eb9 author Kylene Jo Hall Mon, 15 May 2006 09:44:25 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:57 -0700 [PATCH] tpm: fix constant Fix the constant used for the base address when it cannot be determined from ACPI. It was off by one order of magnitude. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64471ebe534dc6cedd72849b2324b52cb5249eb9 tree 3686422779a7bd5846fd0adaffa964d3455ea2eb parent e6333fd4ddf7a583480017f535b9ea53c116ab81 author Benjamin LaHaise Mon, 15 May 2006 09:44:24 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] Add Core Solo and Core Duo support to oprofile Add support to oprofile for the Intel Core Solo and Core Duo processors. See also the patch to add support to oprofile-0.9.1-8.1.1 at http://www.kvack.org/~bcrl/patches/oprofile/oprofile-core-0.9.1.diff . Signed-off-by: Benjamin LaHaise Cc: Philippe Elie Cc: John Levon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6333fd4ddf7a583480017f535b9ea53c116ab81 tree df1aeae28ce51103a0c9eda8f7d40e463297b2ef parent 41e5a6ac80c600e1f8bda0a4871f0b797e097d78 author Hua Zhong Mon, 15 May 2006 09:44:22 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] fix can_share_swap_page() when !CONFIG_SWAP can_share_swap_page() is used to check if the page has the last reference. This avoids allocating a new page for COW if it's the last page. However, if CONFIG_SWAP is not set, can_share_swap_page() is defined as 0, thus always causes a copy for the last COW page. The below simple patch fixes it. Signed-off-by: Hua Zhong Cc: David Howells Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41e5a6ac80c600e1f8bda0a4871f0b797e097d78 tree e2796bac0d285751d027eff931e31c0842669788 parent 343f1fe6f2e3fb4912db241e639b0721c2e14f2e author Latchesar Ionkov Mon, 15 May 2006 09:44:21 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] v9fs: signal handling fixes Multiple races can happen when v9fs is interrupted by a signal and Tflush message is sent to the server. After v9fs sends Tflush it doesn't wait until it receives Rflush, and possibly the response of the original message. This behavior may confuse v9fs what fids are allocated by the file server. This patch fixes the races and the fid allocation. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 343f1fe6f2e3fb4912db241e639b0721c2e14f2e tree 80f5c857ff7d4cd162c7d3fc0b23abc348de9559 parent 3dc7b82ea7649356bf027fba50c16ca50cec31e2 author Latchesar Ionkov Mon, 15 May 2006 09:44:18 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] v9fs: Twalk memory leak v9fs leaks memory if the file server responds with Rerror to a Twalk message. The patch fixes the leak. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dc7b82ea7649356bf027fba50c16ca50cec31e2 tree 52bb14b8021c851d6cbd765f74aafa6c33ea631e parent 263de9b582b0f9b6ad5a0651b7df884fe80d6c3c author Richard Purdie Mon, 15 May 2006 09:44:17 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] LED: Fix sysfs store function error handling Fix the error handling of some LED _store functions. This corrects them to return -EINVAL if the value is not numeric with an optional byte of trailing whitespace. Signed-off-by: Richard Purdie Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 263de9b582b0f9b6ad5a0651b7df884fe80d6c3c tree 256bfce6d1d3ae66e85ae2d5e79be74766ba5f4a parent 68673afd443c5eeb4cebfb9026e3675f43d79f2b author Richard Purdie Mon, 15 May 2006 09:44:16 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] LED: Add maintainer entry for the LED subsystem Add a MAINTAINERS entry for the LED subsystem. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68673afd443c5eeb4cebfb9026e3675f43d79f2b tree b8350ec63cee168284b35016aa097334c215d633 parent a8d2e7d95229db9999682113bfac40b49978f212 author Richard Purdie Mon, 15 May 2006 09:44:15 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] Backlight/LCD Class: Fix sysfs _store error handling The backlight and LCD class _store functions currently accept values like "34 some random strings" without error. This corrects them to return -EINVAL if the value is not numeric with an optional byte of trailing whitespace. Signed-off-by: Richard Purdie Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8d2e7d95229db9999682113bfac40b49978f212 tree f45f31fa12e3f795966006b8cb19ccc4e913f103 parent 39d24e64263cd3211705d3b61ea4171c65030921 author Richard Purdie Mon, 15 May 2006 09:44:14 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] LED: Improve Kconfig information Improve the NEW_LEDS Kconfig information to say what it does as well as what it doesn't. Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39d24e64263cd3211705d3b61ea4171c65030921 tree b527b1395b070180b7f930c0a89530f11bce7b3c parent 48564e628bd7662d7a0b3ac81c41cd0e4cc36dae author Mike Kravetz Mon, 15 May 2006 09:44:13 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] add slab_is_available() routine for boot code slab_is_available() indicates slab based allocators are available for use. SPARSEMEM code needs to know this as it can be called at various times during the boot process. Signed-off-by: Mike Kravetz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48564e628bd7662d7a0b3ac81c41cd0e4cc36dae tree 44f5d76fb7dfa2636b790a0aea1fe8568807a088 parent 2e367a82fc2da335455984a7722c721dd3fa782b author Jan Niehusmann Mon, 15 May 2006 09:44:12 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:56 -0700 [PATCH] smbfs: Fix slab corruption in samba error path Yesterday, I got the following error with 2.6.16.13 during a file copy from a smb filesystem over a wireless link. I guess there was some error on the wireless link, which in turn caused an error condition for the smb filesystem. In the log, smb_file_read reports error=4294966784 (0xfffffe00), which also shows up in the slab dumps, and also is -ERESTARTSYS. Error code 27499 corresponds to 0x6b6b, so the rq_errno field seems to be the only one being set after freeing the slab. In smb_add_request (which is the only place in smbfs where I found ERESTARTSYS), I found the following: if (!timeleft || signal_pending(current)) { /* * On timeout or on interrupt we want to try and remove the * request from the recvq/xmitq. */ smb_lock_server(server); if (!(req->rq_flags & SMB_REQ_RECEIVED)) { list_del_init(&req->rq_queue); smb_rput(req); } smb_unlock_server(server); } [...] if (signal_pending(current)) req->rq_errno = -ERESTARTSYS; I guess that some codepath like smbiod_flush() caused the request to be removed from the queue, and smb_rput(req) be called, without SMB_REQ_RECEIVED being set. This violates an asumption made by the quoted code. Then, the above code calls smb_rput(req) again, the req gets freed, and req->rq_errno = -ERESTARTSYS writes into the already freed slab. As list_del_init doesn't cause an error if called multiple times, that does cause the observed behaviour (freed slab with rq_errno=-ERESTARTSYS). If this observation is correct, the following patch should fix it. I wonder why the smb code uses list_del_init everywhere - using list_del instead would catch such situations by poisoning the next and prev pointers. May 4 23:29:21 knautsch kernel: [17180085.456000] ipw2200: Firmware error detected. Restarting. May 4 23:29:21 knautsch kernel: [17180085.456000] ipw2200: Sysfs 'error' log captured. May 4 23:33:02 knautsch kernel: [17180306.316000] ipw2200: Firmware error detected. Restarting. May 4 23:33:02 knautsch kernel: [17180306.316000] ipw2200: Sysfs 'error' log already exists. May 4 23:33:02 knautsch kernel: [17180306.968000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:34:18 knautsch kernel: [17180383.256000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:34:18 knautsch kernel: [17180383.284000] SMB connection re-established (-5) May 4 23:37:19 knautsch kernel: [17180563.956000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:40:09 knautsch kernel: [17180733.636000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:40:26 knautsch kernel: [17180750.700000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:43:02 knautsch kernel: [17180907.304000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:43:08 knautsch kernel: [17180912.324000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:43:34 knautsch kernel: [17180938.416000] smb_errno: class Unknown, code 27499 from command 0x6b May 4 23:43:34 knautsch kernel: [17180938.416000] Slab corruption: start=c4ebe09c, len=244 May 4 23:43:34 knautsch kernel: [17180938.416000] Redzone: 0x5a2cf071/0x5a2cf071. May 4 23:43:34 knautsch kernel: [17180938.416000] Last user: [](smb_rput+0x53/0x90 [smbfs]) May 4 23:43:34 knautsch kernel: [17180938.416000] 000: 6b 6b 6b 6b 6b 6b 6b 6b 6a 6b 6b 6b 6b 6b 6b 6b May 4 23:43:34 knautsch kernel: [17180938.416000] 0f0: 00 fe ff ff May 4 23:43:34 knautsch kernel: [17180938.416000] Next obj: start=c4ebe19c, len=244 May 4 23:43:34 knautsch kernel: [17180938.416000] Redzone: 0x5a2cf071/0x5a2cf071. May 4 23:43:34 knautsch kernel: [17180938.416000] Last user: [<00000000>](_stext+0x3feffde0/0x30) May 4 23:43:34 knautsch kernel: [17180938.416000] 000: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b May 4 23:43:34 knautsch kernel: [17180938.416000] 010: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b May 4 23:43:34 knautsch kernel: [17180938.460000] SMB connection re-established (-5) May 4 23:43:42 knautsch kernel: [17180946.292000] ipw2200: Firmware error detected. Restarting. May 4 23:43:42 knautsch kernel: [17180946.292000] ipw2200: Sysfs 'error' log already exists. May 4 23:45:04 knautsch kernel: [17181028.752000] ipw2200: Firmware error detected. Restarting. May 4 23:45:04 knautsch kernel: [17181028.752000] ipw2200: Sysfs 'error' log already exists. May 4 23:45:05 knautsch kernel: [17181029.868000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:45:36 knautsch kernel: [17181060.984000] smb_errno: class Unknown, code 27499 from command 0x6b May 4 23:45:36 knautsch kernel: [17181060.984000] Slab corruption: start=c4ebe09c, len=244 May 4 23:45:36 knautsch kernel: [17181060.984000] Redzone: 0x5a2cf071/0x5a2cf071. May 4 23:45:36 knautsch kernel: [17181060.984000] Last user: [](smb_rput+0x53/0x90 [smbfs]) May 4 23:45:36 knautsch kernel: [17181060.984000] 000: 6b 6b 6b 6b 6b 6b 6b 6b 6a 6b 6b 6b 6b 6b 6b 6b May 4 23:45:36 knautsch kernel: [17181060.984000] 0f0: 00 fe ff ff May 4 23:45:36 knautsch kernel: [17181060.984000] Next obj: start=c4ebe19c, len=244 May 4 23:45:36 knautsch kernel: [17181060.984000] Redzone: 0x5a2cf071/0x5a2cf071. May 4 23:45:36 knautsch kernel: [17181060.984000] Last user: [<00000000>](_stext+0x3feffde0/0x30) May 4 23:45:36 knautsch kernel: [17181060.984000] 000: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b May 4 23:45:36 knautsch kernel: [17181060.984000] 010: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b May 4 23:45:36 knautsch kernel: [17181061.024000] SMB connection re-established (-5) May 4 23:46:17 knautsch kernel: [17181102.132000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:47:46 knautsch kernel: [17181190.468000] smb_errno: class Unknown, code 27499 from command 0x6b May 4 23:47:46 knautsch kernel: [17181190.468000] Slab corruption: start=c4ebe09c, len=244 May 4 23:47:46 knautsch kernel: [17181190.468000] Redzone: 0x5a2cf071/0x5a2cf071. May 4 23:47:46 knautsch kernel: [17181190.468000] Last user: [](smb_rput+0x53/0x90 [smbfs]) May 4 23:47:46 knautsch kernel: [17181190.468000] 000: 6b 6b 6b 6b 6b 6b 6b 6b 6a 6b 6b 6b 6b 6b 6b 6b May 4 23:47:46 knautsch kernel: [17181190.468000] 0f0: 00 fe ff ff May 4 23:47:46 knautsch kernel: [17181190.468000] Next obj: start=c4ebe19c, len=244 May 4 23:47:46 knautsch kernel: [17181190.468000] Redzone: 0x5a2cf071/0x5a2cf071. May 4 23:47:46 knautsch kernel: [17181190.468000] Last user: [<00000000>](_stext+0x3feffde0/0x30) May 4 23:47:46 knautsch kernel: [17181190.468000] 000: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b May 4 23:47:46 knautsch kernel: [17181190.468000] 010: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b May 4 23:47:46 knautsch kernel: [17181190.492000] SMB connection re-established (-5) May 4 23:49:20 knautsch kernel: [17181284.828000] smb_file_read: //some_file validation failed, error=4294966784 May 4 23:49:39 knautsch kernel: [17181303.896000] smb_file_read: //some_file validation failed, error=4294966784 Signed-off-by: Jan Niehusmann Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e367a82fc2da335455984a7722c721dd3fa782b tree c2d1030acacd80fe96e7a483bccad3b1702e5c86 parent 5e376613899076396d0c97de67ad072587267370 author Marcelo Tosatti Mon, 15 May 2006 09:44:08 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] Marcelo has moved Signed-off-by: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e376613899076396d0c97de67ad072587267370 tree ecc15c25ee4da7754aa7d137dccebab68820399e parent 0159677857c5ada0a0a2c03a4dd59312382b73d0 author Trent Piepho Mon, 15 May 2006 09:44:06 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] symbol_put_addr() locks kernel Even since a previous patch: Fix race between CONFIG_DEBUG_SLABALLOC and modules Sun, 27 Jun 2004 17:55:19 +0000 (17:55 +0000) http://www.kernel.org/git/?p=linux/kernel/git/torvalds/old-2.6-bkcvs.git;a=commit;h=92b3db26d31cf21b70e3c1eadc56c179506d8fbe The function symbol_put_addr() will deadlock the kernel. symbol_put_addr() would acquire modlist_lock, then while holding the lock call two functions kernel_text_address() and module_text_address() which also try to acquire the same lock. This deadlocks the kernel of course. This patch changes symbol_put_addr() to not acquire the modlist_lock, it doesn't need it since it never looks at the module list directly. Also, it now uses core_kernel_text() instead of kernel_text_address(). The latter has an additional check for addr inside a module, but we don't need to do that since we call module_text_address() (the same function kernel_text_address uses) ourselves. Signed-off-by: Trent Piepho Cc: Zwane Mwaikambo Acked-by: Rusty Russell Cc: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0159677857c5ada0a0a2c03a4dd59312382b73d0 tree 51c3ed1fad1c0bcf732a9810b97f7a68790a75e7 parent 6a050da45b5d855b48b057446847ff1542977b52 author Martin Schwidefsky Mon, 15 May 2006 09:44:05 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] s390: add vmsplice system call Add new vmsplice system call and add missing __NR_xxx defines for sys_set_robust_list, sys_get_robust_list, sys_splice, sys_sync_file_range and sys_tee. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a050da45b5d855b48b057446847ff1542977b52 tree f455f444ddd5be62740cd430c595c6d6a13fb4db parent 698d070746770aaaec78ab4ffa3ab1f1d5c6abe8 author Mark Huang Mon, 15 May 2006 09:44:03 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] initramfs: fix CPIO hardlink check Copy the filenames of hardlinks when inserting them into the hash, since the "name" pointer may point to scratch space (name_buf). Not doing so results in corruption if the scratch space is later overwritten: the wrong file may be hardlinked, or, if the scratch space contains garbage, the link will fail and a 0-byte file will be created instead. Signed-off-by: Mark Huang Acked-by: Al Viro Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 698d070746770aaaec78ab4ffa3ab1f1d5c6abe8 tree 00aab6741bbc7e8c419903a7d8f4f876889c7a8a parent ac924c6034d9095f95ee889f7e31bbb9145da0c2 author Greg Smith Mon, 15 May 2006 09:44:02 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] s390: lcs incorrect test While debugging why our LCS emulator is having some problems I noticed the following weirdness in drivers/s390/net/lcs.c routine lcs_irq. The `if' statement is always true since SCHN_STAT_PCI is defined as 0x80. Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac924c6034d9095f95ee889f7e31bbb9145da0c2 tree 2db4fc64a008ff2b81a0faf381d8c21ccc5006b2 parent 5afdbd6e84c7fbdaa7cfde4cbee0d3a5f4f56da2 author Andrew Morton Mon, 15 May 2006 09:43:59 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] setup_per_zone_pages_min() overflow fix As pointed out in http://bugzilla.kernel.org/show_bug.cgi?id=6490, this function can experience overflows on 32-bit machines, causing our response to changed values of min_free_kbytes to go whacky. Fixing it efficiently is all too hard, so fix it with 64-bit math instead. Cc: Ake Sandgren Cc: Martin Bligh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5afdbd6e84c7fbdaa7cfde4cbee0d3a5f4f56da2 tree 9b4c317054b833245372f0c0e64b015469825479 parent 986733e01d258c26107f1da9d8d47c718349ad2f author Heiko Carstens Mon, 15 May 2006 09:43:59 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] s390: exploit rcu_needs_cpu() interface Exploit rcu_needs_cpu() interface to keep the cpu 'ticking' if necessary. Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 986733e01d258c26107f1da9d8d47c718349ad2f tree 5e0f04a707b8c341f79927ba6fffd0ad55d85c29 parent 3b7c8108273bed41a2fc04533cc9f2026ff38c8e author Heiko Carstens Mon, 15 May 2006 09:43:58 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] RCU: introduce rcu_needs_cpu() interface With "Paul E. McKenney" Introduce rcu_needs_cpu() interface. This can be used to tell if there will be a new rcu batch on a cpu soon by looking at the curlist pointer. This can be used to avoid to enter a tickless idle state where the cpu would miss that a new batch is ready when rcu_start_batch would be called on a different cpu. Signed-off-by: Heiko Carstens Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b7c8108273bed41a2fc04533cc9f2026ff38c8e tree d437254b0cd1b07ecc33631fea13ad79f925353b parent a7b862f663d81858531dfccc0537bc9d8a2a4121 author Olaf Kirch Mon, 15 May 2006 09:43:57 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] smbfs chroot issue (CVE-2006-1864) Mark Moseley reported that a chroot environment on a SMB share can be left via "cd ..\\". Similar to CVE-2006-1863 issue with cifs, this fix is for smbfs. Steven French wrote: Looks fine to me. This should catch the slash on lookup or equivalent, which will be all obvious paths of interest. Signed-off-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7b862f663d81858531dfccc0537bc9d8a2a4121 tree 00d5e21bd77f789150db61fdd999c73d59fa78b2 parent 73d58588091e81e5ee4266488e2fb09a410f1512 author Chris Wedgwood Mon, 15 May 2006 09:43:55 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:55 -0700 [PATCH] VIA quirk fixup, additional PCI IDs An earlier commit (75cf7456dd87335f574dcd53c4ae616a2ad71a11) changed an overly-zealous PCI quirk to only poke those VIA devices that need it. However, some PCI devices were not included in what I hope is now the full list. Consequently we're failing to run the quirk on all machines which need it, causing IRQ routing failures. This should I hope correct this. Thanks to Masoud Sharbiani for pointing this out and testing the fix. Signed-off-by: Chris Wedgwood Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73d58588091e81e5ee4266488e2fb09a410f1512 tree 38effb2a3d6ba36aa9839adffb2ec4f8e737a509 parent 94585136606e0598a93ec145d9a899c8ec9b2208 author Benjamin Herrenschmidt Mon, 15 May 2006 09:43:53 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:54 -0700 [PATCH] pcmcia Oopses fixes Fix some NULL dereferences in the pcmcia code when using old userland tools. Signed-off-by: Benjamin Herrenschmidt Acked-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94585136606e0598a93ec145d9a899c8ec9b2208 tree ae20ed8b78f9ef2e12ec02eac7380942e6860ca2 parent 90d5ede5985f3b172cc3ccd89bf8c52a209088a5 author Kylene Jo Hall Mon, 15 May 2006 09:43:53 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:54 -0700 [PATCH] tpm: update module dependencies The TIS driver is dependent upon information from the ACPI table for device discovery thus it compiles but does no actual work without this dependency. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90d5ede5985f3b172cc3ccd89bf8c52a209088a5 tree 3163c41681c1cf7d90a7c272c82378413198d16f parent a5370553952a9a414860d878b67c49eff11313bd author Stefan Schweizer Mon, 15 May 2006 09:43:52 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:54 -0700 [PATCH] Fix capi reload by unregistering the correct major I am having the bug FATAL: Error inserting capi ([..]/capi.ko): Device or resource busy when I try to reload capi after loading it. in dmesg: capi20: unable to get major 68 Fix the issue which is caused by setting the major to zero when registering the chrdev succeeded. (akpm: this means that we can again not use `major=0' (dynamic major allocation) for this driver). Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5370553952a9a414860d878b67c49eff11313bd tree 8a893bd5e6519fbb7e1b46506096607be7093a50 parent 6aff5cb8ec270db569800b1bb59bd20003a76f07 author Ian Kent Mon, 15 May 2006 09:43:51 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:54 -0700 [PATCH] autofs4: NFY_NONE wait race fix This patch fixes two problems. First, the comparison of entries in the waitq.c was incorrect. Second, the NFY_NONE check was incorrect. The test of whether the dentry is mounted if ineffective, for example, if an expire fails then we could wait forever on a non existant expire. The bug was identified by Jeff Moyer. The patch changes autofs4 to wait on expires only as this is all that's needed. If there is no existing wait when autofs4_wait is call with a type of NFY_NONE it delays until either a wait appears or the the expire flag is cleared. Signed-off-by: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6aff5cb8ec270db569800b1bb59bd20003a76f07 tree 93e876b49dbbbd9e34b8d8ba99db38b4d51f27d9 parent 0cccca06f9870eb6daa89357b8a99ad041865553 author Adrian Bunk Mon, 15 May 2006 09:43:50 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:54 -0700 [PATCH] fs/open.c: unexport sys_openat Remove the unused EXPORT_SYMBOL_GPL(sys_openat). Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cccca06f9870eb6daa89357b8a99ad041865553 tree 216251e4cbbdbb9509ed0b6fc769050ece2fb93e parent 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 author Serge E. Hallyn Mon, 15 May 2006 09:43:48 -0700 committer Linus Torvalds Mon, 15 May 2006 11:20:54 -0700 [PATCH] selinux: check for failed kmalloc in security_sid_to_context() Check for NULL kmalloc return value before writing to it. Signed-off-by: Serge E. Hallyn Acked-by: James Morris Cc: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 tree 7220f29b3d3e068c139904093ae3eb49b41f1ef2 parent 032ebf2620ef99a4fedaa0f77dc2272095ac5863 author Linus Torvalds Sat, 13 May 2006 08:01:23 -0700 committer Linus Torvalds Sat, 13 May 2006 08:01:23 -0700 Revert "[PATCH] i386: export: memory more than 4G through /proc/iomem" This reverts commit 10dbe196a8da6b3196881269c6639c0ec11c36cb. The resource struct is still 32-bit, so trying to save a 64-bit memory size there obviously won't work. When we merge the 64-bit resource series, we can re-enable this. Thanks to Sachin Sant and Maneesh Soni for debugging Cc: Maneesh Soni Cc: Sachin Sant Cc: Russell King Cc: Sharyathi Nagesh Cc: Arjan van de Ven Cc: Vivek Goyal Signed-off-by: Linus Torvalds commit 032ebf2620ef99a4fedaa0f77dc2272095ac5863 tree 18a341e1548a304efea7543c715d23255ada6fa3 parent 18552b8f227bddf569dade5c69798a37839ea913 author Linus Torvalds Fri, 12 May 2006 18:42:09 -0700 committer Linus Torvalds Fri, 12 May 2006 18:42:09 -0700 Alternative fix for MMC oops on unmount after removal Make sure to clear the driverfs_dev pointer when we do del_gendisk() (on disk removal), so that other users that may still have a ref to the disk won't try to use the stale pointer. Also move the KOBJ_REMOVE uevent handler up, so that the uevent still has access to the driverfs_dev data. This all should hopefully fix the problems with MMC umounts after device removals that caused commit 56cf6504fc1c0c221b82cebc16a444b684140fb7 and its reversal (1a2acc9e9214699a99389e323e6686e9e0e2ca67). Original problem reported by Todd Blumer and others. Acked-by: Greg KH Cc: Russell King Cc: James Bottomley Cc: Erik Mouw Cc: Andrew Vasquez Cc: Todd Blumer Signed-off-by: Linus Torvalds commit 18552b8f227bddf569dade5c69798a37839ea913 tree 2538b43849d9ba6da32e1a309907c9ad488a939c parent faa88df860fdfad13afc99fc7201432f9263b3b5 parent bd89efc532fe41f867f848144cc8b42054ddf6f9 author Linus Torvalds Fri, 12 May 2006 15:39:32 -0700 committer Linus Torvalds Fri, 12 May 2006 15:39:32 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NEIGH]: Fix IP-over-ATM and ARP interaction. [TG3]: ethtool always report port is TP. commit faa88df860fdfad13afc99fc7201432f9263b3b5 tree 0c5b480922c4a2d65154f610ae04928790de96da parent 1b52fa98edd1c3e663ea4a06519e3d20976084a8 parent 586152560ae8df2a9babf1a8b667d7a145cb8208 author Linus Torvalds Fri, 12 May 2006 15:26:29 -0700 committer Linus Torvalds Fri, 12 May 2006 15:26:29 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Fix warning on prom_getproperty in openprom.c [SPARC]: Handle UNWIND_INFO properly. [SPARC64]: Update defconfig. [SPARC]: show device name in /proc/dvma_map [SPARC]: Remove duplicate symbol exports commit 1b52fa98edd1c3e663ea4a06519e3d20976084a8 tree 178d5fd1fe2230b39f49cd36f481024e49878eb1 parent 6f4bb3d8205d943acafa2f536f37131777524b67 author Sean Hefty Fri, 12 May 2006 14:57:52 -0700 committer Roland Dreier Fri, 12 May 2006 14:57:52 -0700 IB: refcount race fixes Fix race condition during destruction calls to avoid possibility of accessing object after it has been freed. Instead of waking up a wait queue directly, which is susceptible to a race where the object is freed between the reference count going to 0 and the wake_up(), use a completion to wait in the function doing the freeing. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6f4bb3d8205d943acafa2f536f37131777524b67 tree c91bbf0190eef4e36be82fed70a6cbd4f01694a3 parent be1fd94fd698e9dfa2676f688d4e9b034e0d4b9e author Roland Dreier Fri, 12 May 2006 14:57:52 -0700 committer Roland Dreier Fri, 12 May 2006 14:57:52 -0700 IB/ipath: Properly terminate PCI ID table The ipath driver's table of PCI IDs needs a { 0, } entry at the end. This makes all of the device aliases visible to userspace so hotplug loads the module for all supported devices. Without the patch, modinfo ipath_core only shows: alias: pci:v00001FC1d0000000Dsv*sd*bc*sc*i* instead of the correct: alias: pci:v00001FC1d00000010sv*sd*bc*sc*i* alias: pci:v00001FC1d0000000Dsv*sd*bc*sc*i* Signed-off-by: Roland Dreier Signed-off-by: Bryan O'Sullivan commit bd89efc532fe41f867f848144cc8b42054ddf6f9 tree fcf90049cb5a15bf6689cdbc6038c3fe22079009 parent ef34814426862c41c061520d4ac833be5914b5ba author Simon Kelley Fri, 12 May 2006 14:56:08 -0700 committer David S. Miller Fri, 12 May 2006 14:56:08 -0700 [NEIGH]: Fix IP-over-ATM and ARP interaction. The classical IP over ATM code maintains its own IPv4 <-> ARP table, using the standard neighbour-table code. The neigh_table_init function adds this neighbour table to a linked list of all neighbor tables which is used by the functions neigh_delete() neigh_add() and neightbl_set(), all called by the netlink code. Once the ATM neighbour table is added to the list, there are two tables with family == AF_INET there, and ARP entries sent via netlink go into the first table with matching family. This is indeterminate and often wrong. To see the bug, on a kernel with CLIP enabled, create a standard IPv4 ARP entry by pinging an unused address on a local subnet. Then attempt to complete that entry by doing ip neigh replace lladdr nud reachable Looking at the ARP tables by using ip neigh show will reveal two ARP entries for the same address. One of these can be found in /proc/net/arp, and the other in /proc/net/atm/arp. This patch adds a new function, neigh_table_init_no_netlink() which does everything the neigh_table_init() does, except add the table to the netlink all-arp-tables chain. In addition neigh_table_init() has a check that all tables on the chain have a distinct address family. The init call in clip.c is changed to call neigh_table_init_no_netlink(). Since ATM ARP tables are rather more complicated than can currently be handled by the available rtattrs in the netlink protocol, no functionality is lost by this patch, and non-ATM ARP manipulation via netlink is rescued. A more complete solution would involve a rtattr for ATM ARP entries and some way for the netlink code to give neigh_add and friends more information than just address family with which to find the correct ARP table. [ I've changed the assertion checking in neigh_table_init() to not use BUG_ON() while holding neigh_tbl_lock. Instead we remember that we found an existing tbl with the same family, and after dropping the lock we'll give a diagnostic kernel log message and a stack dump. -DaveM ] Signed-off-by: Simon Kelley Signed-off-by: David S. Miller commit 586152560ae8df2a9babf1a8b667d7a145cb8208 tree 18c02fc0987e4f42ea6ab212b01caebfda49be80 parent 06a1be167ea77c436657587e26cd4d7d6401784c author Martin Habets Fri, 12 May 2006 12:53:59 -0700 committer David S. Miller Fri, 12 May 2006 12:53:59 -0700 [SPARC]: Fix warning on prom_getproperty in openprom.c Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit ef34814426862c41c061520d4ac833be5914b5ba tree b844afa6b8c0f9ef5062c5a37462b1f47b858baf parent d649dafd0713f2f3dfe29baa783868db33aa2c11 author Karsten Keil Fri, 12 May 2006 12:49:08 -0700 committer David S. Miller Fri, 12 May 2006 12:49:08 -0700 [TG3]: ethtool always report port is TP. Even with fiber cards ethtool reports that the connected port is TP, the patch fix this. Signed-off-by: Karsten Keil Acked-by: Michael Chan Signed-off-by: David S. Miller commit 06a1be167ea77c436657587e26cd4d7d6401784c tree 1d9ed9094496a1e02bfe551631b03495db337a89 parent 1f8aa2f66b7253d1a42ead0142c7a00d2df5ac89 author David S. Miller Fri, 12 May 2006 12:45:50 -0700 committer David S. Miller Fri, 12 May 2006 12:45:50 -0700 [SPARC]: Handle UNWIND_INFO properly. For sparc32 we need R_SPARC_UA32 relocation support, for sparc64 we need the handle R_SPARC_DISP32 relocations. Based upon reports and initial patch by Martin Habets. Signed-off-by: David S. Miller commit be1fd94fd698e9dfa2676f688d4e9b034e0d4b9e tree fc19e966f53d2bc7202fd4565d999595515ce50b parent 0d38eddab9ce6de3a9d6d583043dfa97b6bc0d3b parent 95563d343fec8d3e2f667c95230ac4ab7674b757 author Linus Torvalds Fri, 12 May 2006 12:14:52 -0700 committer Linus Torvalds Fri, 12 May 2006 12:14:52 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: [PATCH] scx200_acb: Fix for the CS5535 errata [PATCH] scx200_acb: Fix resource name use after free [PATCH] scx200_acb: Fix return on init error commit 0d38eddab9ce6de3a9d6d583043dfa97b6bc0d3b tree 59f1f4d3712ce3658f7540704d64c8d8ad6d4635 parent 1a2acc9e9214699a99389e323e6686e9e0e2ca67 parent df3fccb14ad02c5fabe095a104a0323c223f2833 author Linus Torvalds Fri, 12 May 2006 12:14:19 -0700 committer Linus Torvalds Fri, 12 May 2006 12:14:19 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: [PATCH] USB: fix omninet driver bug [PATCH] USB: add ark3116 usb to serial driver [PATCH] usbserial: Fixes leak in serial_open() error path. [PATCH] usbserial: Fixes use-after-free in serial_open(). [PATCH] USB: Emagic USB firmware loading fixes [PATCH] USB: add an IBM USB keyboard to the HID_QUIRK_NOGET blacklist [PATCH] USB: Add Sieraa Wireless 580 evdo card to airprime.c [PATCH] USB: ftdi_sio: add device id for ACT Solutions HomePro ZWave interface [PATCH] USB: ftdi_sio: Add support for HCG HF Dual ISO RFID Reader [PATCH] USB: ub oops in block_uevent [PATCH] USB: usbcore: don't check the device's power source [PATCH] USB: fix OHCI PM regression [PATCH] USB: pegasus fixes (logstorm, suspend) [PATCH] USBATM: fix modinfo output [PATCH] USBATM: change the default speedtouch iso altsetting [PATCH] USB: fix bug in ohci-hcd.c ohci_restart() commit 1a2acc9e9214699a99389e323e6686e9e0e2ca67 tree 8f8072ba0624ceb63ac0115a81d85435323fe79c parent d8c3291c73b958243b33f8509d4507e76dafd055 author Linus Torvalds Fri, 12 May 2006 12:08:46 -0700 committer Linus Torvalds Fri, 12 May 2006 12:08:46 -0700 Revert "[BLOCK] Fix oops on removal of SD/MMC card" This reverts commit 56cf6504fc1c0c221b82cebc16a444b684140fb7. Both Erik Mouw and Andrew Vasquez independently pinpointed this commit as causing problems, where the slab cache for a driver is never released (most obviously causing problems when immediately re-loading that driver, resulting in a "kmem_cache_create: duplicate cache " message, but it can also cause other trouble). James Bottomley dug into it, and reports: "OK, here's the scoop. The problem patch adds a get of driverfs_dev in add_disk(), but doesn't put it again until disk_release() (which occurs on final put_disk() of the gendisk). However, in SCSI, the driverfs_dev is the sdev_gendev. That means there's a reference held on sdev_gendev until final disk put. Unfortunately, we use the driver model driver_remove to trigger del_gendisk (which removes the gendisk from visibility and decrements the refcount), so we've introduced an unbreakable deadlock in the reference counting with this. I suggest simply reversing this patch at the moment. If Russell and Jens can tell me what they're trying to do I'll see if there's another way to do it." so hereby the patch gets reverted, waiting for a better fix. Cc: Jens Axboe Cc: Russell King Cc: James Bottomley Cc: Erik Mouw Cc: Andrew Vasquez Signed-off-by: Linus Torvalds commit df3fccb14ad02c5fabe095a104a0323c223f2833 tree 4db98656e7dedd27139bdb5de5e85ee847695b4a parent 815ddc99dd8108908d14c699a37d0f5974da6def author Greg Kroah-Hartman Tue, 02 May 2006 08:44:45 +0200 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:10 -0700 [PATCH] USB: fix omninet driver bug I introduced this way back in 2.6.13 when adding the port lock logic. This device talks out through different "ports" all at the same time, so the lock logic was wrong, preventing any data from ever being sent properly. Thanks a lot to Bernhard Reiter for being patient and helping with debugging this. Cc: Bernhard Reiter Signed-off-by: Greg Kroah-Hartman commit 815ddc99dd8108908d14c699a37d0f5974da6def tree d1e82ecdb93e1da6c9f370c8489ff63945e2d70b parent 71a84163ca6b4e36744978385e94150af32f9d75 author Greg Kroah-Hartman Fri, 12 May 2006 11:05:29 -0700 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] USB: add ark3116 usb to serial driver Based on Simon's original driver, with some minor code cleanups and tidying by me. Cc: Simon Schulz Signed-off-by: Greg Kroah-Hartman commit 71a84163ca6b4e36744978385e94150af32f9d75 tree 2f00bcc4c102660e55c2ff840ce4db6d44ede988 parent 704936a25bda9bb12e35bb222d5e3f26186dc279 author Luiz Fernando Capitulino Thu, 11 May 2006 22:34:24 -0300 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] usbserial: Fixes leak in serial_open() error path. If serial_open() fails at the port assignment or mutex_lock_interruptible() is interrupted, the 'serial' object will never be freed. We should call kref_put() when those errors happens. Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 704936a25bda9bb12e35bb222d5e3f26186dc279 tree 723b247a002e47be72d4ba203277870de0fea220 parent 16c23f7d88cbcce491f9370b2846fad66e8ef319 author Luiz Fernando Capitulino Thu, 11 May 2006 22:34:17 -0300 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] usbserial: Fixes use-after-free in serial_open(). If the device is disconnected while serial_open() is executing and either try_module_get() or the device specific open function fails, the kref_put() call in the 'bailout_kref_put' label will free the memory pointed out by 'port'. The subsequent dereferences in the 'bailout_kref_put' label will be invalid. The fix is just to assure kref_put() is called after any 'port' usage. Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 16c23f7d88cbcce491f9370b2846fad66e8ef319 tree 7e69ad84548acabb0bebcfd594c1986292947d83 parent 332bbf613868a5d5938ad9fb7436b2beae72d53d author Monty Tue, 09 May 2006 12:37:22 -0700 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] USB: Emagic USB firmware loading fixes It's become apparent as machines get faster that the emagic kernel firmware loaders (based on the ezusb loader) have a reset race. a 400MHz TiBook never tripped it, but a 2GHz Pentium M seems to hit it about 30% of the time. The bug is seen as a hung USB box and the kernel error: drivers/usb/misc/emi62.c: emi62_load_firmware - error loading firmware: error = -110 The patch below inserts a delay after deasserting reset to allow the box to settle before a new command is issued. This affects only device startup. Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 332bbf613868a5d5938ad9fb7436b2beae72d53d tree 02fc85e7046a4a586e5a1a91f3cb3dcf8a8dcf28 parent b68f7de02ae380ddb4e5e457e3fe945ddfd0aa08 author Olaf Hering Fri, 05 May 2006 11:07:21 +0200 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] USB: add an IBM USB keyboard to the HID_QUIRK_NOGET blacklist After recent changes, the USB keyboard as shipped with IBM pSeries systems does not work anymore, unless the keyboard is replugged after reboot. Adding this model to the blacklist fixes it. Signed-off-by: Olaf Hering Signed-off-by: Greg Kroah-Hartman commit b68f7de02ae380ddb4e5e457e3fe945ddfd0aa08 tree 671bd42200534fcb638838d19f4ec84bdc33925e parent 72a9f958421a519e69b3e7b409948c3a294f4a32 author Ken Brush Mon, 08 May 2006 20:24:12 -0500 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:08 -0700 [PATCH] USB: Add Sieraa Wireless 580 evdo card to airprime.c This adds the Sierra Wireless card to airprime.c. I tested this on my laptop. Signed-off-by: Ken Brush Signed-off-by: Greg Kroah-Hartman commit 95563d343fec8d3e2f667c95230ac4ab7674b757 tree 4e0c4f18ff45abe5f691f860633ed0a6bfbcd65b parent b33d0798e6cfae1fcee75afc808fe5690a48a814 author Jordan Crouse Fri, 28 Apr 2006 22:53:30 +0200 committer Greg Kroah-Hartman Tue, 09 May 2006 13:04:21 -0700 [PATCH] scx200_acb: Fix for the CS5535 errata This is a fix for the CS5535 errata 111: When the SMBus controller tries to access a non-existing device, it sets the NEGACK bit, SMBus I/O offset 01h[4], to 1 after it detects no acknowledge at the ninth clock. The specification states that the bit can be cleared by writing a 1 to it, but under certain circumstances it is possible for this bit to not clear. Writing a 0 to the bit resets the internal state machine and clears the issue. Since all writable bits in ACBST are W1C bits (write-one-to-clear) the second write doesn't affect any other logic except the buggy NEGACK state machine. The second write clears an internal register which is responsible for "overwriting" the NEGACK bit in ACBST. Signed-off-by: Jordan Crouse Signed-off-by: Andrew Morton Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b33d0798e6cfae1fcee75afc808fe5690a48a814 tree fee80034c1633f195c1f32493063208abde7d5ca parent 6f9c2963888e60e46a9e0bd09a25740abce29262 author Jean Delvare Wed, 26 Apr 2006 23:00:16 +0200 committer Greg Kroah-Hartman Tue, 09 May 2006 13:04:21 -0700 [PATCH] scx200_acb: Fix resource name use after free We can't pass a string on the stack to request_region. As soon as we leave the function that stack is gone and the string is lost. Let's use the same string we identify the i2c_adapter with instead, it's more simple, more consistent, and just works. This is the second half of fix to bug #6445. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 6f9c2963888e60e46a9e0bd09a25740abce29262 tree a6f6a310c409fefda006790a77c7ae0d559a33ca parent e515f048c46e457ef61ce9c8b56bd36e825a48a0 author Jean Delvare Wed, 26 Apr 2006 22:50:32 +0200 committer Greg Kroah-Hartman Tue, 09 May 2006 13:04:21 -0700 [PATCH] scx200_acb: Fix return on init error The scx200_acb driver shouldn't return failure after initialization if it successfully registered at least one i2c_adapter, else we are leaking resources. The driver was OK in that respect up to 2.6.16, a recent change broke it. This is part of the fix to bug #6445. Signed-off-by: Jean Delvare Cc: Ben Gardner Signed-off-by: Greg Kroah-Hartman commit 72a9f958421a519e69b3e7b409948c3a294f4a32 tree 52a2c09831f26a592c5490fa044620f904578414 parent 20a0f47e18c646bcc772282512fc59e56b2fc968 author Razvan Gavril Thu, 04 May 2006 11:35:49 +0300 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:56 -0700 [PATCH] USB: ftdi_sio: add device id for ACT Solutions HomePro ZWave interface Signed-off-by: Razvan Gavril Signed-off-by: Greg Kroah-Hartman commit 20a0f47e18c646bcc772282512fc59e56b2fc968 tree 552f6f3d30107ae7546463180d5589e93af1a967 parent 77ef6c4d6e23653a79eedacdd6d1d0da7083e59c author Ian Abbott Thu, 04 May 2006 11:34:25 +0100 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: ftdi_sio: Add support for HCG HF Dual ISO RFID Reader This patch adds support for ACG Identification Technologies GmbH's HF Dual ISO Reader (an RFID tag reader) to the ftdi_sio driver's device ID table. The product ID was supplied by anotonios (anton at goto10 dot org) on the ftdi-usb-sio-devel list and subsequently verified by myself (Ian Abbott). Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 77ef6c4d6e23653a79eedacdd6d1d0da7083e59c tree 5dd68fb616175ffcf2939beaef8ed06a43179173 parent 436f5762bcd4929825a0725d4bc78337e6fc0d8f author Pete Zaitcev Wed, 03 May 2006 00:16:00 -0700 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: ub oops in block_uevent In kernel 2.6.16, if a mounted storage device is removed, an oops happens because ub supplies an interface device (and kobject) to the block layer, but neglects to pin it. And apparently, the block layer expects its users to pin device structures. The code in ub was broken this way for years. But the bug was exposed only by 2.6.16 when it started to call block_uevent on close, which traverses device structures (kobjects actually). Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 436f5762bcd4929825a0725d4bc78337e6fc0d8f tree f2f709575ddec3b58d1c7c13af82bdcfc82dbfcf parent db4cefaaea4c6d67cdaebfd315abc791c5c9d22f author Alan Stern Tue, 02 May 2006 15:22:41 -0400 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: usbcore: don't check the device's power source The choose_configuration() routine contains code the determine the device's power source, so that configurations requiring external power can be ruled out if the device is running on bus power. Unfortunately it turns out that some devices have errors in their config descriptors and other devices don't like the GET_DEVICE_STATUS request. Since that information wasn't used for anything else, this patch (as673) removes the code, leaving only a comment. It fixes bugzilla entry #6448. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit db4cefaaea4c6d67cdaebfd315abc791c5c9d22f tree 111e4ada3f449fd71be268de7e5afbaf4299e333 parent 7e713b825610de9a9584c189c72e2d9f2326359c author David Brownell Mon, 01 May 2006 22:07:13 -0700 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: fix OHCI PM regression This fixes a small regression in USB controller power usage for many OHCI controllers, notably including every non-PCI version of OHCI: on those systems, the runtime autosuspend mechanism is no longer enabled. The change moves to saner defaults. All root hubs are expected to handle remote wakeup (and hence autosuspend), although drivers for buggy silicon may override that default. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7e713b825610de9a9584c189c72e2d9f2326359c tree d0936b3d12c2185f537b339942719ca2cedbef9d parent 6275cdfa0fe032208937a3567ebb8bcfd42d20b1 author David Brownell Mon, 01 May 2006 14:02:45 -0700 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: pegasus fixes (logstorm, suspend) Teach "pegasus" to handle a few of the disconnect fault paths without hundreds of usless syslog messages. Handle the carrier check workqueue entry even if the driver has not been opened. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 6275cdfa0fe032208937a3567ebb8bcfd42d20b1 tree dfb84d591316f8b3d21e724574d98359fd0260b1 parent 67c752b41a4238c1a2d7eebcd061ff8c1127d3e9 author Duncan Sands Fri, 28 Apr 2006 18:52:16 +0200 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:54 -0700 [PATCH] USBATM: fix modinfo output Because of the way stringify works, using an expression like 64 * 1024 for UDSL_MAX_BUF_SIZE results in 64 * 1024 turning up in the modinfo output instead of 65536. So use 65536 directly (this was the only way I found of fixing this). Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 67c752b41a4238c1a2d7eebcd061ff8c1127d3e9 tree b2a568a12e965fc76f276c108a0e7027e84eb6a3 parent 839ab1d4ce4dfd7e6c189391a82c584292488b41 author Duncan Sands Fri, 28 Apr 2006 18:44:06 +0200 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:54 -0700 [PATCH] USBATM: change the default speedtouch iso altsetting The maximum possible bandwidth for a speedtouch modem is about 7Mbaud. You can only get this by using isochronous urbs (enable_isoc=1) and altsetting 3. With the current default altsetting of 2, the modem maxes out at about 4Mbaud. So change the default altsetting to 3 when using isochronous urbs. It would be nice to base the altsetting on the detected line speed, but that's hard given the current design. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 839ab1d4ce4dfd7e6c189391a82c584292488b41 tree 052591e6d261b96052367fd9baaa2fcd1ae38d5f parent e515f048c46e457ef61ce9c8b56bd36e825a48a0 author David Brownell Wed, 26 Apr 2006 14:39:11 -0700 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:54 -0700 [PATCH] USB: fix bug in ohci-hcd.c ohci_restart() A loop on a power-lost resume path used the wrong index. I suspect khubd has been working around such bugs. Noticed by Andreas Mohr . Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1f8aa2f66b7253d1a42ead0142c7a00d2df5ac89 tree d5e65e11301d33e91e207efa44454350f8ba32f0 parent 4cfbd7eb24975e942c3b6c0119c953c3a7a5f787 author David S. Miller Mon, 08 May 2006 15:13:14 -0700 committer David S. Miller Mon, 08 May 2006 15:13:14 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 4cfbd7eb24975e942c3b6c0119c953c3a7a5f787 tree dbda6c396a00aa89beaedf2fb00d047c3335f825 parent bb3426ad6659282d9244d4909e69aa639d0360d0 author Martin Habets Sun, 07 May 2006 23:43:19 -0700 committer David S. Miller Sun, 07 May 2006 23:43:19 -0700 [SPARC]: show device name in /proc/dvma_map This patch will set the device name in a resource, which will be shown in /proc/dvma_map. Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit bb3426ad6659282d9244d4909e69aa639d0360d0 tree c46e768412146e7791d163664edc72ecffe7f99e parent 9d21f09ca03d1142f1988001f228d02581d8986c author Martin Habets Sun, 07 May 2006 23:04:06 -0700 committer David S. Miller Sun, 07 May 2006 23:04:06 -0700 [SPARC]: Remove duplicate symbol exports This patch resolves the following build warnings seen in 2.6.17-rc3: WARNING: vmlinux: 'sys_close' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'memchr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strstr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strnlen' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strrchr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strchr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcmp' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strncat' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcat' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strncpy' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcpy' exported twice. Previous export was in vmlinux Signed-off-by: Martin Habets Signed-off-by: David S. Miller