commit 95064a75ebf8744e1ff595e8cd7ff9b6c851523e Author: Linus Torvalds Date: Tue Sep 12 18:41:36 2006 -0700 Linux v2.6.18-rc7 One last time.. commit 3e2aac366f40f4cf4f3b1d9101b27f703998dfbc Author: Henk Vergonet Date: Fri Sep 8 02:21:01 2006 +0200 USB: Fix unload oops and memory leak in yealink driver This patch fixes a memory leak and a kernel oops when trying to unload the driver, due to an unbalanced cleanup. Thanks Ivar Jensen for spotting my mistake. Signed-off-by: Henk Vergonet Signed-off-by: Greg Kroah-Hartman commit 5992583889ce6b7960e8023e356b2a0930ebce7c Author: Matthias Urlichs Date: Mon Sep 11 12:35:20 2006 +0200 usbserial: Reference leak A sufficiently-large number of USB serial devices causes a reference leak when /proc/tty/drivers/usbserial is read. Signed-Off-By: Matthias Urlichs Signed-off-by: Greg Kroah-Hartman commit f6bc0c1c5b0fe393efaf922e01887c33b35f2910 Author: Al Viro Date: Tue Sep 12 02:59:45 2006 -0400 [PATCH] sparc64 audit syscall classes hookup ... that should do it for all targets; the only remaining issues are mips (currently treated as non-biarch) and handling of other OS emulations (OSF/SunOS/Solaris/???). The latter would need to be assigned new AUDIT_ARCH_... ABI numbers anyway... Signed-off-by: Al Viro commit e65e1fc2d24b09c496af76e9c5253ac30b300a89 Author: Al Viro Date: Tue Sep 12 03:04:40 2006 -0400 [PATCH] syscall class hookup for all normal targets Take default arch/*/kernel/audit.c to lib/, have those with special needs (== biarch) define AUDIT_ARCH in their Kconfig. Signed-off-by: Al Viro commit 1bb99a649af92e53ed7391afaf6c2d45a6f57b42 Author: Paul Mundt Date: Tue Sep 12 14:40:09 2006 +0900 sh64: Add a sane pm_power_off implementation. sh64 wasn't providing a sensible pm_power_off(), add one, and just wrap it to machine_power_off, which already does the right thing. Signed-off-by: Paul Mundt commit 56060141482d0a9351ea02e2aa7153de8cd41423 Author: Paul Mundt Date: Tue Sep 12 14:38:23 2006 +0900 sh64: Use generic BUG_ON()/WARN_ON(). sh64 doesn't need to do anything special for BUG_ON() or WARN_ON(), use the generic versions. Signed-off-by: Paul Mundt commit 21264136ce7c3c7032c42e7c2440f5d89039ca5a Author: Paul Mundt Date: Tue Sep 12 14:36:46 2006 +0900 sh64: Trivial build fixes. While we've been sorting out the toolchain fiasco, some of the code has suffered a bit of bitrot. Building with GCC4 also brings up some more build warnings. Trivial fixes for both issues. Signed-off-by: Paul Mundt commit ccdfc526a92c5ebb549a7de06adca3fd54f03c7e Author: Paul Mundt Date: Tue Sep 12 14:21:25 2006 +0900 sh64: Drop deprecated ISA tuning for legacy toolchains. The original sh64 toolchains required that we tune the ISA level accordingly to not have head.S/entry.S blow up. With current toolchains, this is no longer the case, and the syntax magically changed as well, causing all current toolchains to die a horrible death. Incidentally, code generation in other parts of the kernel is now significantly complex enough that none of the older toolchains make it very far these days, so there's not even any point in preserving legacy compatability via as-option. This fixes a long-standing issue, as noted here: http://lkml.org/lkml/2005/1/5/223 Though at the time the current toolchains were too broken to make adjusting the tuning worthwhile. Signed-off-by: Paul Mundt commit 55669bfa141b488be865341ed12e188967d11308 Author: Al Viro Date: Thu Aug 31 19:26:40 2006 -0400 [PATCH] audit: AUDIT_PERM support add support for AUDIT_PERM predicate Signed-off-by: Al Viro commit dc104fb3231f11e95b5a0f09ae3ab27a8fd5b2e8 Author: Al Viro Date: Thu Aug 31 19:05:56 2006 -0400 [PATCH] audit: more syscall classes added Signed-off-by: Al Viro commit c08037997d4ae3e9a679fbdb46ed47c957916e14 Author: Al Viro Date: Thu Aug 31 19:02:42 2006 -0400 [PATCH] syscall classes hookup for ppc and s390 Signed-off-by: Al Viro commit 5974501e2d44546748e67c635cec20ba66619a3d Author: Amy Griffis Date: Thu Sep 7 17:46:18 2006 -0400 [PATCH] update audit rule change messages Make the audit message for implicit rule removal more informative. Make the rule update message consistent with other messages. Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 8ef2d3040e5cf38f7d64a408038f576b4a5ec987 Author: Amy Griffis Date: Thu Sep 7 17:03:02 2006 -0400 [PATCH] sanity check audit_buffer Add sanity checks for NULL audit_buffer consistent with other audit_log* routines. Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 3b33ac3182a4554742757a0c61ee1df162cf8225 Author: Steve Grubb Date: Sat Aug 26 14:06:20 2006 -0400 [PATCH] fix ppid bug in 2.6.18 kernel Hello, During some troubleshooting, I found that ppid was accidentally omitted from the legacy rule section. This resulted in EINVAL for any rule with ppid sent with AUDIT_ADD. Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit 28a2a3f58707cba16b329b90f601c01599456491 Author: Alan Cox Date: Mon Sep 11 14:45:07 2006 +0100 [PATCH] Fix 2.6.18-rc6 IDE breakage, add missing ident needed for current VIA boards There are two changes here. The first reverses the broken PCI_DEVICE conversion back to the old format. The second adds a missing PCI ID so you can actually boot 2.6.18 on 2 month old VIA motherboards (right now only 2.6.18-mm works). CC'd to Jeff to check the PCI ident but its a) in several distro kernels and b) in 2.6.18-mm [twice ??] Signed-off-by: Alan Cox Cc: Jeff Garzik Signed-off-by: Linus Torvalds commit 519854876c66bd04b0c12d3cead6e0e5fc5a1167 Author: Dirk Opfer Date: Wed Sep 6 19:53:32 2006 +0200 [PATCH] Fix dm9000 release_resource dm9000_release_board calls release_resource with the platform resource instead of the requested resource: db->addr_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); db->addr_req = request_mem_region(db->addr_res->start, i, pdev->name); dm9000_release_board: if (db->addr_res != NULL) { release_resource(db->addr_res); kfree(db->addr_req); With this behavior the kernel will crash on the second removal. The attached patch fix this problem. Signed-off-by: Dirk Opfer Signed-off-by: Jeff Garzik commit 6708374178d225ef77571ed23b30e8a93c36add5 Author: Tejun Heo Date: Mon Sep 11 06:29:03 2006 +0900 [PATCH] ata_piix: add map 01b for ICH7M Although the document says otherwise, some ich7m uses map 01b. This patch adds separate map DB for ICH7M and adds map entry for 01b. This was spotted on an ASUS laptop by Jonathan Dieter. Signed-off-by: Tejun Heo Cc: Jonathan Dieter Signed-off-by: Jeff Garzik commit 62f1d0e6de138b91d55fbd7d579c837ed62e9e31 Author: Andres Salomon Date: Mon Sep 11 08:51:05 2006 -0400 [libata] sata_mv: errata check buglet fix Fix a buglet; the errata check below this code is assuming the value in the sstatus variable is what was pulled out of the SCR_STATUS register. However, the status checks in the timeout loop clobber everything but the first 4 bits of sstatus, so the errata checks are invalid. This patch changes it to not clobber SStatus. Signed-off-by: Andres Salomon Signed-off-by: Jeff Garzik commit e7ea8fc285c5ac9040ae80b01d529ea453f1b647 Author: Mauro Carvalho Chehab Date: Sun Sep 10 07:39:00 2006 -0300 V4L/DVB (4608c): Fix I2C dependencies for saa7146 modules Signed-off-by: Mauro Carvalho Chehab commit c482d4f6e87932092c0a30da8e6403b23544f894 Author: Andrew de Quincey Date: Sun Sep 10 13:43:40 2006 -0300 V4L/DVB (4608b): i2c deps fix on DVB Several DVB modules depends on I2C Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 8a905162e038367503bac732bf1e3e01c19158b9 Author: Mauro Carvalho Chehab Date: Sun Sep 10 12:01:19 2006 -0300 V4L/DVB (4605): Fixes an issue with V4L1 and make headers-install V4L1 support should be disabled when no CONFIG_VIDEO_V4L1_COMPAT is defined, to allow checking for broken V4L2 ports. This is very important during the migration phase for V4L2 API. However, userspace apps should be capable of using both APIs, since they need to test at runtime, via VIDIOCGCAP ioctl, if V4L1 is supported. So, when __KERNEL__ is not defined, those ioctls and corresponding structs should be visible. This patch also removes the obsolete defines HAVE_V4L1 and HAVE_V4L2, that where causing some confusion, and were replaced by CONFIG_VIDEO_V4L1_COMPAT and CONFIG_VIDEO_V4L2. Signed-off-by: Mauro Carvalho Chehab commit c663155c3db58d1fff43a105eb5a0e9147ec2a6b Author: Mauro Carvalho Chehab Date: Wed Aug 23 11:17:30 2006 -0300 V4L/DVB (4520): Fix an error when loading bttv driver on PV M4900. Previously, this were reported: Ooops: IR config error [card=139] Signed-off-by: Mauro Carvalho Chehab commit c2d1923313d75fcc30ad1e981df591c3446dc191 Author: Hermann Pitton Date: Mon Aug 21 14:14:33 2006 -0300 V4L/DVB (4511): Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to fix UHF switch functionality The tena_9533_di_pal_ranges use 0x04 instead the original 0x08 for the UHF (range 2) switching. This is wrong and therefore nothing happens. Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to make the UHF switch working again. Signed-off-by: Hermann Pitton Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c3ab204ccbe42d9eb60270e41110f2c5c9214952 Author: Mauro Carvalho Chehab Date: Sun Sep 10 09:31:37 2006 -0300 V4L/DVB (4494a): Fix compilation when V4L1 support is not present VIDIOCGMBUF should be compiled only when V4L1 support is selected, since this ioctl is from the obsoleted API. Signed-off-by: Mauro Carvalho Chehab commit d17f901defef635292f90a969dadfdbd95b0f104 Author: Ben Dooks Date: Sat Sep 9 21:26:54 2006 +0100 [ARM] 3778/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [simtec] Patch from Ben Dooks Remove changelog entries from include/asm-arm/arch-s3c2410 for all simtec .h files as these are irrelevant with version control. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit c6e58ebb373666eba007e3793789e06a4655df61 Author: Ben Dooks Date: Sat Sep 9 21:24:13 2006 +0100 [ARM] 3783/1: S3C2412: fix IRQ_EINT0 to IRQ_EINT3 handling Patch from Ben Dooks The IRQ_EINT0 through IRQ_EINT3 handling has changed on the S3C2412 from the previous SoCs in the range, and thus we need to add code to handle this. The changes come about due to these IRQs being displayed in two different registers, and needing to be acked and masked in both. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 3c06cd1c99449b2fd373df24fbc87e804f4ec4e6 Author: Ben Dooks Date: Sat Sep 9 19:44:57 2006 +0100 [ARM] 3779/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [left] Patch from Ben Dooks Remove the last of the hangelogs from include/asm-arm/arch-s3c2410, as this information is available from the revision control system Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 92e4805fbc76f2af0f4139f88265dc73f91af051 Author: Ben Dooks Date: Sat Sep 9 19:44:54 2006 +0100 [ARM] 3777/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [regs-*.h] Patch from Ben Dooks Remove changelog entries from include/asm-arm/arch-s3c2410 for all regs-*.h as these are irrelevant with version control Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 46c09e1673554d59674d222339f3ff303ad6715f Author: Ben Dooks Date: Sat Sep 9 19:44:52 2006 +0100 [ARM] 3776/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 Patch from Ben Dooks Remove changelog entries from include/asm-arm/arch-s3c2410 as these are irrelevant with version control Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 189e74ee9c18a5440511c5af525377c609d6ebbd Author: Ben Dooks Date: Sat Sep 9 19:44:50 2006 +0100 [ARM] 3775/1: S3C24XX: do not add same sysdev_driver to two classes Patch from Ben Dooks The s3c244x-irq.c code makes the mistake of adding the same drive to two different sys-classes. This causes the class lists to become corrupted and the suspend code to OOPS. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 38f5745c5a90641079fd5b48600ae63f7ab6edcd Author: Jack Steiner Date: Thu Aug 31 11:35:57 2006 -0500 [IA64] SN fix for cpu hotplug/kexec The sn_cpu_init() is required for cpu initialization on SN platforms. Change __init to __cpuinit so that the function is not freed with init code/data. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 1c7d67073e2d196597f541351bc9b109c8a93528 Author: Jack Steiner Date: Thu Aug 31 11:34:47 2006 -0500 [IA64] Save register stack contents on cpu start The SN PROM uses the register stack in the slave loop. The contents must be preserved for the OS to return to the slave loop via offlining a cpu or for kexec. A 'flushrs" is needed to force the stack to be written to memory prior to changing bspstore. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 2636255488484e04d6d54303d2b0ec30f7ef7e02 Author: Andreas Schwab Date: Mon Sep 4 21:56:09 2006 +0200 [IA64] Unwire set/get_robust_list The syscalls set/get_robust_list must not be wired up until futex_atomic_cmpxchg_inatomic is implemented. Otherwise the kernel will hang in handle_futex_death. Signed-off-by: Andreas Schwab Signed-off-by: Tony Luck commit b8444d00762703e1b6146fce12ce2684885f8bf6 Author: Stephane Eranian Date: Fri Aug 25 14:00:19 2006 -0700 [IA64] correct file descriptor reference counting in perfmon Fix a bug in sys_perfmonctl() whereby it was not correctly decrementing the file descriptor reference count. Signed-off-by: stephane eranian Signed-off-by: Tony Luck commit e9f7bee1df223dcf83743b46cb06c08d95497ec0 Author: Trond Myklebust Date: Fri Sep 8 09:48:54 2006 -0700 [PATCH] NFS: large non-page-aligned direct I/O clobbers memory The logic in nfs_direct_read_schedule and nfs_direct_write_schedule can allow data->npages to be one larger than rpages. This causes a page pointer to be written beyond the end of the pagevec in nfs_read_data (or nfs_write_data). Fix this by making nfs_(read|write)_alloc() calculate the size of the pagevec array, and initialise data->npages. Also get rid of the redundant argument to nfs_commit_alloc(). Signed-off-by: Trond Myklebust Cc: Chuck Lever Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 016eb4a0ed06a3677d67a584da901f0e9a63c666 Author: Andrew Morton Date: Fri Sep 8 09:48:38 2006 -0700 [PATCH] invalidate_complete_page() race fix If a CPU faults this page into pagetables after invalidate_mapping_pages() checked page_mapped(), invalidate_complete_page() will still proceed to remove the page from pagecache. This leaves the page-faulting process with a detached page. If it was MAP_SHARED then file data loss will ensue. Fix that up by checking the page's refcount after taking tree_lock. Cc: Nick Piggin Cc: Hugh Dickins Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3665d0e58fa44f50c744f85c7e8ad21d5b10e206 Author: Badari Pulavarty Date: Fri Sep 8 09:48:21 2006 -0700 [PATCH] ext3_getblk() should handle HOLE correctly It has been reported that ext3_getblk() is not doing the right thing and triggering following WARN(): BUG: warning at fs/ext3/inode.c:1016/ext3_getblk() ext3_getblk+0x98/0x2a6 md_wakeup_thread+0x26/0x2a ext3_bread+0x1f/0x88 ext3_quota_read+0x136/0x1ae v1_read_dqblk+0x61/0xac dquot_acquire+0xf6/0x107 ext3_acquire_dquot+0x46/0x68 dqget+0x155/0x1e7 dquot_transfer+0x3e0/0x3e9 dput+0x23/0x13e ext3_setattr+0xc3/0x240 current_fs_time+0x52/0x6a notify_change+0x2bd/0x30d chown_common+0x9c/0xc5 strncpy_from_user+0x3b/0x68 do_path_lookup+0xdf/0x266 __user_walk_fd+0x44/0x5a sys_chown+0x4a/0x55 vfs_write+0xe7/0x13c sys_mkdir+0x1f/0x23 syscall_call+0x7/0xb Looking at the code, it looks like it's not handle HOLE correctly. It ends up returning -EIO. Here is the patch to fix it. If we really want to be paranoid, we can allow return values 0 (HOLE), 1 (we asked for one block) and return -EIO for more than 1 block. But I really don't see a reason for doing it - all we need is the block# here. (doesn't matter how many blocks are mapped). ext3_get_blocks_handle() returns number of blocks it mapped. It returns 0 in case of HOLE. ext3_getblk() should handle HOLE properly (currently its dumping warning stack and returning -EIO). Signed-off-by: Badari Pulavarty Acked-by: Mingming Cao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47d4b9066df023670a61e74565a75293cf15a441 Author: David Wang Date: Fri Sep 8 09:47:51 2006 -0700 [PATCH] sis5513: add SiS south bridge ID 0x966 and 0x968 New SiS south bridge device ID is 0x966. Next coming product will be 0x968. (Will be released in Q4, this year) We don't make any updates to the IDE controller. Signed-off-by: David Wang Cc: Jeff Garzik Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67bb2c692cc02e53c23e4debc92c3a79ddc52a8c Author: Alexey Dobriyan Date: Fri Sep 8 09:47:34 2006 -0700 [PATCH] sh: fix FPN_START typo Not that it passes allmodconfig without it... Signed-off-by: Alexey Dobriyan Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Mark Haverkamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4495c9e5cabc82bb4ce930eb5d3dc7544f3f8389 Author: Alexey Dobriyan Date: Fri Sep 8 09:47:24 2006 -0700 [PATCH] optical /proc/ide/*/media Sergey Vlasov reported that his "FUJITSU MCC3064AP, ATAPI OPTICAL drive" pops up as UNKNOWN in /proc/ide/*/media . Closes #4145. Signed-off-by: Alexey Dobriyan Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5780e976e19faff345fcef4a01db87108b51a44 Author: Thomas Gleixner Date: Fri Sep 8 09:47:15 2006 -0700 [PATCH] Use the correct restart option for futex_lock_pi The current implementation of futex_lock_pi returns -ERESTART_RESTARTBLOCK in case that the lock operation has been interrupted by a signal. This results in a return of -EINTR to userspace in case there is an handler for the signal. This is wrong, because userspace expects that the lock function does not return in any case of signal delivery. This was not caught by my insufficient test case, but triggered a nasty userspace problem in an high load application scenario. Unfortunately also glibc does not check for this invalid return value. Using -ERSTARTNOINTR makes sure, that the interrupted syscall is restarted. The restart block related code can be safely removed, as the possible timeout argument is an absolute time value. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a459756810912d2c2bf188cef566af255936b4d Author: Kirill Korotaev Date: Thu Sep 7 14:17:04 2006 +0400 [PATCH] IA64,sparc: local DoS with corrupted ELFs This prevents cross-region mappings on IA64 and SPARC which could lead to system crash. They were correctly trapped for normal mmap() calls, but not for the kernel internal calls generated by executable loading. This code just moves the architecture-specific cross-region checks into an arch-specific "arch_mmap_check()" macro, and defines that for the architectures that needed it (ia64, sparc and sparc64). Architectures that don't have any special requirements can just ignore the new cross-region check, since the mmap() code will just notice on its own when the macro isn't defined. Signed-off-by: Pavel Emelianov Signed-off-by: Kirill Korotaev Acked-by: David Miller Signed-off-by: Greg Kroah-Hartman [ Cleaned up to not affect architectures that don't need it ] Signed-off-by: Linus Torvalds commit 09494d5d11628f118496747b74db3e56d071c6bc Author: Kai Lindhom Date: Thu Sep 7 21:25:51 2006 +0200 usbtouchscreen: fix ITM data reading From: Kai Lindhom Signed-off-by: Daniel Ritz Acked-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit eaede2cb75f8f8d492342e7c1469635237b32795 Author: Ralf Schlatterbeck Date: Wed Sep 6 12:15:02 2006 +0200 USB: New device ID for ftdi_sio usb serial driver The patch adds a new device ID for the Gamma Scout Geiger counter device. Signed-off-by: Ralf Schlatterbeck Signed-off-by: Greg Kroah-Hartman commit 3003b9f78920226367c2f2d3a5598397578a730b Author: Nobuhiro Iwamatsu Date: Fri Sep 1 11:32:28 2006 +0900 USB: Support for USB20SVGA-WH & USB20SVGA-DG This patch is support USB20SVGA-WH & USB20SVGA-DG of the sisusb device. As for this device, Device ID is different according to the color of the product. A blue device is supported. However, a green, white device is not supported. http://www.lubic.jp/uv_method.html ( Japanese only ) . Green, white USB20SVGA comes to work by applying the patch . And, it be able to use three USB20SVGA( Blue , Green , White ). Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Greg Kroah-Hartman commit f064902457a775f7f70432832d67a5628c250456 Author: Adrian Bunk Date: Mon Sep 4 13:41:10 2006 +0200 USB: hid-core.c: fix duplicate USB_DEVICE_ID_GTCO_404 On Fri, Sep 01, 2006 at 01:58:18AM -0700, Andrew Morton wrote: >... > Changes since 2.6.18-rc4-mm3: >... > +gregkh-usb-hid-core.c-adds-all-gtco-calcomp-digitizers-and-interwrite-school-products-to-blacklist.patch >... > USB tree updates. >... The GNU C compiler spotted the following bug: <-- snip --> ... CC drivers/usb/input/hid-core.o /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/drivers/usb/input/hid-core.c:1446:1: warning: "USB_DEVICE_ID_GTCO_404" redefined /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/drivers/usb/input/hid-core.c:1445:1: warning: this is the location of the previous definition ... <-- snip --> This patch fixes this cut'n'paste error. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 6fe9febb8af2f82f9caace1aa1c00cd8de7469ac Author: Pierre Ossman Date: Thu Sep 7 16:01:30 2006 +0100 [MMC] Always use a sector size of 512 bytes Both MMC and SD specifications specify (although a bit unclearly in the MMC case) that a sector size of 512 bytes must always be supported by the card. Cards can report larger "native" size than this, and cards >= 2 GB even must do so. Most other readers use 512 bytes even for these cards. We should do the same to be compatible. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit d773d7255199a6c8934e197756f54a1115dd127b Author: Russell King Date: Thu Sep 7 15:57:12 2006 +0100 [MMC] Cleanup 385e3227d4d83ab13d7767c4bb3593b0256bf246 Rather than having two places which independently calculate the timeout for data transfers, make it a library function instead. Signed-off-by: Russell King Acked-by: Pierre Ossman commit 148f93d59cc9bb5e0f9a04d36a6f91d435e1a3f7 Author: Pavel Pisa Date: Thu Sep 7 15:53:29 2006 +0100 [ARM] 3751/1: i.MX/MX1 SD/MMC use 512 bytes request for SCR read Patch from Pavel Pisa This is another approach to SDHC deficiency workaround. It seems, that previous solution based on 16 bytes (FIFO length size) read is still timing sensitive on genirq and fully preemptive kernels. The new solution is backuped by M9328 UM statement, that only 512 byte block are working properly and by 2.4.26 FreeScale's SDHC code. Jay Monkman reports significant improvement on code based on this driver after applying this change on MX21 as well. Signed-off-by: Pavel Pisa Signed-off-by: Russell King commit 385e3227d4d83ab13d7767c4bb3593b0256bf246 Author: Pierre Ossman Date: Sun Jun 18 14:34:37 2006 +0200 [MMC] Fix SD timeout calculation Secure Digital cards use a different algorithm to calculate the timeout for data transfers. Using the MMC one works often, but not always. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit f57b225e432d80ee46f48536cc55ea6cf62c5570 Author: David Brownell Date: Sun Sep 3 06:43:33 2006 -0700 [MMC] constify mmc_host_ops Let drivers constify MMC host method operations tables, moving them from ".data" to ".rodata". Signed-off-by: David Brownell Acked-by: Pierre Ossman Signed-off-by: Russell King commit 0edc7d0f3709e8c3bb7e69c4df614218a753361e Author: Nathan Scott Date: Thu Sep 7 14:27:23 2006 +1000 [XFS] Fix a bad pointer dereference in the quota statvfs handling. SGI-PV: 955993 SGI-Modid: xfs-linux-melb:xfs-kern:26934a Signed-off-by: Nathan Scott Signed-off-by: David Chatterton commit 0a8d17d090a4939643a52194b7d4a4001b9b2d93 Author: David Chinner Date: Thu Sep 7 14:27:15 2006 +1000 [XFS] Fix xfs_splice_write() so appended data gets to disk. xfs_splice_write() failed to update the on disk inode size when extending the so when the file was closed the range extended by splice was truncated off. Hence any region of a file written to by splice would end up as a hole full of zeros. SGI-PV: 955939 SGI-Modid: xfs-linux-melb:xfs-kern:26920a Signed-off-by: David Chinner Signed-off-by: David Chatterton commit 721259bce2851893155c6cb88a3f8ecb106b348c Author: Lachlan McIlroy Date: Thu Sep 7 14:27:05 2006 +1000 [XFS] Fix ABBA deadlock between i_mutex and iolock. Avoid calling __blockdev_direct_IO for the DIO_OWN_LOCKING case for direct I/O reads since it drops and reacquires the i_mutex while holding the iolock and this violates the locking order. SGI-PV: 955696 SGI-Modid: xfs-linux-melb:xfs-kern:26898a Signed-off-by: Lachlan McIlroy Signed-off-by: David Chatterton commit 4be536debe3f7b0c62283e77fd6bd8bdb9f83c6f Author: David Chinner Date: Thu Sep 7 14:26:50 2006 +1000 [XFS] Prevent free space oversubscription and xfssyncd looping. The fix for recent ENOSPC deadlocks introduced certain limitations on allocations. The fix could cause xfssyncd to loop endlessly if we did not leave some space free for the allocator to work correctly. Basically, we needed to ensure that we had at least 4 blocks free for an AG free list and a block for the inode bmap btree at all times. However, this did not take into account the fact that each AG has a free list that needs 4 blocks. Hence any filesystem with more than one AG could cause oversubscription of free space and make xfssyncd spin forever trying to allocate space needed for AG freelists that was not available in the AG. The following patch reserves space for the free lists in all AGs plus the inode bmap btree which prevents oversubscription. It also prevents those blocks from being reported as free space (as they can never be used) and makes the SMP in-core superblock accounting code and the reserved block ioctl respect this requirement. SGI-PV: 955674 SGI-Modid: xfs-linux-melb:xfs-kern:26894a Signed-off-by: David Chinner Signed-off-by: David Chatterton commit b835bebe95608c81270636a78b70333afb011925 Author: Steve French Date: Wed Sep 6 22:02:22 2006 +0000 [CIFS] Fix CIFS readdir access denied when SE Linux enabled CIFS had one path in which dentry was instantiated before the corresponding inode metadata was filled in. Fixes Redhat bugzilla bug #163493 Signed-off-by: Steve French Acked-by: Eric Paris Acked-by: Dave Kleikamp commit 3142afb568d266765bde94f90b0dfee7e5cb08ce Author: Ben Dooks Date: Wed Sep 6 19:03:31 2006 +0100 [ARM] 3774/1: S3C24XX: SMDK2413 has two machine IDs Patch from Ben Dooks It turns out we have both SMDK2413 and S3C2413 for the same board. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit f854d37ab6b74f5a2d768d28e9583bc2991692c1 Author: Catalin Marinas Date: Wed Sep 6 19:03:28 2006 +0100 [ARM] 3773/1: Add the HWCAP_VFP bit for the ARM926 CPUs Patch from Catalin Marinas The ARM926EJ-S CPU has the VFP coprocessor and therefore it should be shown in the /proc/cpuinfo if CONFIG_VFP is enabled. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit f64c2c01b74763c1c2be4d0dfb8b7f3f586fedb7 Author: Martin Michlmayr Date: Wed Sep 6 19:03:24 2006 +0100 [ARM] 3772/1: Fix compilation error in mach-ixp4xx/nslu2* Patch from Martin Michlmayr Include linux/irq.h in the nslu2 code in order to avoid the following compiler error: CC arch/arm/mach-ixp4xx/nslu2-power.o arch/arm/mach-ixp4xx/nslu2-power.c: In function 'nslu2_power_init': arch/arm/mach-ixp4xx/nslu2-power.c:53: warning: implicit declaration of function 'set_irq_type' arch/arm/mach-ixp4xx/nslu2-power.c:53: error: 'IRQ_TYPE_LEVEL_LOW' undeclared (first use in this function) arch/arm/mach-ixp4xx/nslu2-power.c:53: error: (Each undeclared identifier is reported only once arch/arm/mach-ixp4xx/nslu2-power.c:53: error: for each function it appears in.) arch/arm/mach-ixp4xx/nslu2-power.c:54: error: 'IRQ_TYPE_LEVEL_HIGH' undeclared (first use in this function) make[5]: *** [arch/arm/mach-ixp4xx/nslu2-power.o] Error 1 Signed-off-by: Martin Michlmayr Signed-off-by: Russell King commit 916a0021014d1b21b76c21793694978bbd69cf22 Author: Ben Dooks Date: Wed Sep 6 19:03:21 2006 +0100 [ARM] 3767/1: S3C24XX: remove changelog comments from arch/arm/mach-s3c2410 Patch from Ben Dooks Remove the pointless changelog comments from arch/arm/mach-s3c2410 files, as all this can be found from the revision control system. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit e89bc81103bb8798daae2c1871229620ed725657 Author: Catalin Marinas Date: Wed Sep 6 19:03:14 2006 +0100 [ARM] 3766/1: Fix typo in ARM _raw_read_trylock Patch from Catalin Marinas A comma was missing between tmp and tmp2. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit ebd6c17109aed086908ae3b0949265fd07712659 Author: john stultz Date: Wed Sep 6 11:02:45 2006 +0100 [PATCH] FRV: Use the generic time stuff for FRV Use the generic time stuff for FRV. Signed-off-by: John Stultz Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit b4a228346c1a7d09f565e750d2e988c5671e9fa3 Author: David Woodhouse Date: Wed Sep 6 09:03:26 2006 -0700 [PATCH] Remove unneeded asm-i386/cpufeature.h from user visibility. Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit bb98ad77d8451a3ccf9478738ffe7ec63394fcdf Author: Ismail Donmez Date: Wed Sep 6 00:03:44 2006 -0700 [PATCH] Move linux/device.h include in linux/atmdev.h to #ifdef __KERNEL__ section linux/device.h header is not included in the David Woodhouse's kernel-headers git tree which is used for userspace kernel headers. Which results in compile errors when building iproute2. Attached patch moves linux/device.h include under the #ifdef __KERNEL__ section. Signed-off-by: Ismail Donmez Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 068c4579fe5c21e84c7cb2ba89db80899e25104e Author: Ingo Molnar Date: Wed Sep 6 00:03:44 2006 -0700 [PATCH] lockdep: do not touch console state when tainting the kernel Remove an unintended console_verbose() side-effect from add_taint(). Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 471b40d0dfc17bf0161629950b82524d41bc37ce Author: Pavel Machek Date: Wed Sep 6 00:03:43 2006 -0700 [PATCH] prevent swsusp with PAE PAE + swsusp results in hard-to-debug crash about 50% of time during resume. Cause is known, fix needs to be ported from x86-64 (but we can't make it to 2.6.18, and I'd like this to be worked around in 2.6.18). Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96dd7421a06a5bc6eb731323b95efcb2fd864854 Author: Thomas Gleixner Date: Wed Sep 6 00:03:42 2006 -0700 [PATCH] prevent timespec/timeval to ktime_t overflow Frank v. Waveren pointed out that on 64bit machines the timespec to ktime_t conversion might overflow. This is also true for timeval to ktime_t conversions. This breaks a "sleep inf" on 64bit machines. While a timespec/timeval with tx.sec = MAX_LONG is valid by specification the internal representation of ktime_t is based on nanoseconds. The conversion of seconds to nanoseconds overflows for seconds values >= (MAX_LONG / NSEC_PER_SEC). Check the seconds argument to the conversion and limit it to the maximum time which can be represented by ktime_t. Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: Frank v Waveren Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe2bbc4832659b7ffc867cac03e0a92ae81e11e4 Author: Henrik Kretzschmar Date: Wed Sep 6 00:03:41 2006 -0700 [PATCH] add missing desctiption in super.c Adds kernel-doc for alloc_super() type in fs/super.c. Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6dba28379edc08327ede01ff41bd3c9dd46a7fa0 Author: Henrik Kretzschmar Date: Wed Sep 6 00:03:40 2006 -0700 [PATCH] Documentation for lock_key in struct hrtimer_base Fixes an error message on make xmldocs. Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc47e7b592dc45b03c27b0a4c8f2d215dae9944d Author: Jarek Poplawski Date: Wed Sep 6 00:03:39 2006 -0700 [PATCH] lockdep ifdef fix With CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_LOCKDEP=y CONFIG_DEBUG_LOCK_ALLOC=y # CONFIG_PROVE_LOCKING is not set spin_unlock_irqrestore() goes through lockdep but spin_lock_irqsave() doesn't. Apparently, bad things happen. Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d279490543ee4e7c51371eb605b578ab47f45305 Author: Brice Goglin Date: Tue Sep 5 21:58:50 2006 -0400 [PATCH] myri10ge: update the firmware download URL in Kconfig Update the firmware download URL in Kconfig to match the header in drivers/net/myri10ge/myri10ge.c. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik