commit 05ff0e291af086f4325bac76abad250690bbbd63 tree 3ea47e8ef5bebc1261302e3d0775414fb78037c4 parent 5eea7ee2075b245d505285bb422e2fa8d686e5c8 parent 55669bfa141b488be865341ed12e188967d11308 author Linus Torvalds Mon, 11 Sep 2006 11:43:17 -0700 committer Linus Torvalds Mon, 11 Sep 2006 11:43:17 -0700 Merge branch 'audit.b28' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current * 'audit.b28' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: [PATCH] audit: AUDIT_PERM support [PATCH] audit: more syscall classes added [PATCH] syscall classes hookup for ppc and s390 [PATCH] update audit rule change messages [PATCH] sanity check audit_buffer [PATCH] fix ppid bug in 2.6.18 kernel commit 5eea7ee2075b245d505285bb422e2fa8d686e5c8 tree 2a2c6e67cfbf8fb6f40b6b5c41c63617f2f0ae6a parent e004876c3b0b6a71406069b0e55368cb9bbdc920 parent 09494d5d11628f118496747b74db3e56d071c6bc author Linus Torvalds Mon, 11 Sep 2006 11:42:27 -0700 committer Linus Torvalds Mon, 11 Sep 2006 11:42:27 -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: usbtouchscreen: fix ITM data reading USB: New device ID for ftdi_sio usb serial driver USB: Support for USB20SVGA-WH & USB20SVGA-DG USB: hid-core.c: fix duplicate USB_DEVICE_ID_GTCO_404 commit 55669bfa141b488be865341ed12e188967d11308 tree efeec37a93f46c48937eb849c083da9a42ed3709 parent dc104fb3231f11e95b5a0f09ae3ab27a8fd5b2e8 author Al Viro Thu, 31 Aug 2006 19:26:40 -0400 committer Al Viro Mon, 11 Sep 2006 13:32:30 -0400 [PATCH] audit: AUDIT_PERM support add support for AUDIT_PERM predicate Signed-off-by: Al Viro commit dc104fb3231f11e95b5a0f09ae3ab27a8fd5b2e8 tree 2db993a72a4eac79841f531e2961576bf9fb56d7 parent c08037997d4ae3e9a679fbdb46ed47c957916e14 author Al Viro Thu, 31 Aug 2006 19:05:56 -0400 committer Al Viro Mon, 11 Sep 2006 13:32:27 -0400 [PATCH] audit: more syscall classes added Signed-off-by: Al Viro commit c08037997d4ae3e9a679fbdb46ed47c957916e14 tree 952bc446670f19efb3a008f4846905d50ef235fd parent 5974501e2d44546748e67c635cec20ba66619a3d author Al Viro Thu, 31 Aug 2006 19:02:42 -0400 committer Al Viro Mon, 11 Sep 2006 13:32:25 -0400 [PATCH] syscall classes hookup for ppc and s390 Signed-off-by: Al Viro commit 5974501e2d44546748e67c635cec20ba66619a3d tree f36ef74c1192b73d25a84f9c09ddb844a0d59cc6 parent 8ef2d3040e5cf38f7d64a408038f576b4a5ec987 author Amy Griffis Thu, 07 Sep 2006 17:46:18 -0400 committer Al Viro Mon, 11 Sep 2006 13:32:17 -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 tree def11d400d2262e104cb1c64a953276794d8c9a8 parent 3b33ac3182a4554742757a0c61ee1df162cf8225 author Amy Griffis Thu, 07 Sep 2006 17:03:02 -0400 committer Al Viro Mon, 11 Sep 2006 13:32:17 -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 tree edf8603a39931681f679388d3aaee154930f9192 parent e004876c3b0b6a71406069b0e55368cb9bbdc920 author Steve Grubb Sat, 26 Aug 2006 14:06:20 -0400 committer Al Viro Mon, 11 Sep 2006 13:32:04 -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 e004876c3b0b6a71406069b0e55368cb9bbdc920 tree 43f95e14b282cbc683ec66539de25e0e94649f65 parent 5a05e5bf204e729b79e9462785f2fa09d5126855 parent 6fe9febb8af2f82f9caace1aa1c00cd8de7469ac author Linus Torvalds Mon, 11 Sep 2006 07:56:38 -0700 committer Linus Torvalds Mon, 11 Sep 2006 07:56:38 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Always use a sector size of 512 bytes [MMC] Cleanup 385e3227d4d83ab13d7767c4bb3593b0256bf246 [ARM] 3751/1: i.MX/MX1 SD/MMC use 512 bytes request for SCR read [MMC] Fix SD timeout calculation [MMC] constify mmc_host_ops commit 5a05e5bf204e729b79e9462785f2fa09d5126855 tree 02a12cfad8c17835cc2689cb35a0fa979cedfc1e parent 08a55c01b504360d48b8123c87b383f7e6a2ef21 parent d17f901defef635292f90a969dadfdbd95b0f104 author Linus Torvalds Mon, 11 Sep 2006 07:55:39 -0700 committer Linus Torvalds Mon, 11 Sep 2006 07:55:39 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3778/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [simtec] [ARM] 3783/1: S3C2412: fix IRQ_EINT0 to IRQ_EINT3 handling [ARM] 3779/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [left] [ARM] 3777/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [regs-*.h] [ARM] 3776/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [ARM] 3775/1: S3C24XX: do not add same sysdev_driver to two classes [ARM] 3774/1: S3C24XX: SMDK2413 has two machine IDs [ARM] 3773/1: Add the HWCAP_VFP bit for the ARM926 CPUs [ARM] 3772/1: Fix compilation error in mach-ixp4xx/nslu2* [ARM] 3767/1: S3C24XX: remove changelog comments from arch/arm/mach-s3c2410 [ARM] 3766/1: Fix typo in ARM _raw_read_trylock commit 08a55c01b504360d48b8123c87b383f7e6a2ef21 tree 33d8591741486a959b6130a5c8b73382db16cbe1 parent 3f2f1257ff6327e330d9e4f0ba1a48a73b0044dc parent 519854876c66bd04b0c12d3cead6e0e5fc5a1167 author Linus Torvalds Mon, 11 Sep 2006 07:54:45 -0700 committer Linus Torvalds Mon, 11 Sep 2006 07:54:45 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] Fix dm9000 release_resource commit 3f2f1257ff6327e330d9e4f0ba1a48a73b0044dc tree e64179c528521b544634e055a222e120e0987530 parent 28a2a3f58707cba16b329b90f601c01599456491 parent 6708374178d225ef77571ed23b30e8a93c36add5 author Linus Torvalds Mon, 11 Sep 2006 07:54:14 -0700 committer Linus Torvalds Mon, 11 Sep 2006 07:54:14 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] ata_piix: add map 01b for ICH7M [libata] sata_mv: errata check buglet fix commit 28a2a3f58707cba16b329b90f601c01599456491 tree 3d8aeaee3c4d843c4c676b2243579cf80f9fcaa7 parent 38f5745c5a90641079fd5b48600ae63f7ab6edcd author Alan Cox Mon, 11 Sep 2006 14:45:07 +0100 committer Linus Torvalds Mon, 11 Sep 2006 07:53:44 -0700 [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 tree a76da09513b838d6ccd41545ba6f5f9f328acf46 parent 38f5745c5a90641079fd5b48600ae63f7ab6edcd author Dirk Opfer Wed, 06 Sep 2006 19:53:32 +0200 committer Jeff Garzik Mon, 11 Sep 2006 09:08:38 -0400 [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 tree 1d07dcc9a3be36ab7015d783ac4c2bfa5879e2f3 parent 62f1d0e6de138b91d55fbd7d579c837ed62e9e31 author Tejun Heo Mon, 11 Sep 2006 06:29:03 +0900 committer Jeff Garzik Mon, 11 Sep 2006 08:52:29 -0400 [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 tree b3842135c320101acdd8c457459786537b9ed4ed parent c336923b668fdcf0312efbec3b44895d713f4d81 author Andres Salomon Mon, 11 Sep 2006 08:51:05 -0400 committer Jeff Garzik Mon, 11 Sep 2006 08:51:05 -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 d17f901defef635292f90a969dadfdbd95b0f104 tree 936d48a2409d2ce15e43cee6ec22bda2a9e08483 parent c6e58ebb373666eba007e3793789e06a4655df61 author Ben Dooks Sat, 09 Sep 2006 21:26:54 +0100 committer Russell King Sat, 09 Sep 2006 21:26:54 +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 tree 2b325fb3be45d0768268d32fc747519513ddf2d5 parent 3c06cd1c99449b2fd373df24fbc87e804f4ec4e6 author Ben Dooks Sat, 09 Sep 2006 21:24:13 +0100 committer Russell King Sat, 09 Sep 2006 21:24:13 +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 tree c7b4bd853a08aa0c564df129fc6543c4afdf26fb parent 92e4805fbc76f2af0f4139f88265dc73f91af051 author Ben Dooks Sat, 09 Sep 2006 19:44:57 +0100 committer Russell King Sat, 09 Sep 2006 19:44:57 +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 tree 49cfd6f688317e40335239a20a6bc860c0b59bc4 parent 46c09e1673554d59674d222339f3ff303ad6715f author Ben Dooks Sat, 09 Sep 2006 19:44:54 +0100 committer Russell King Sat, 09 Sep 2006 19:44:54 +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 tree adbb6bcf707629b0ed8a3597fe197c8158981cef parent 189e74ee9c18a5440511c5af525377c609d6ebbd author Ben Dooks Sat, 09 Sep 2006 19:44:52 +0100 committer Russell King Sat, 09 Sep 2006 19:44:52 +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 tree 7c7e85d3ae869af30c2aaa2e8318015cdead02a5 parent 3142afb568d266765bde94f90b0dfee7e5cb08ce author Ben Dooks Sat, 09 Sep 2006 19:44:50 +0100 committer Russell King Sat, 09 Sep 2006 19:44:50 +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 tree 42bd4d5fd3fb6a1b3016731d53be5732de55725d parent 1c7d67073e2d196597f541351bc9b109c8a93528 author Jack Steiner Thu, 31 Aug 2006 11:35:57 -0500 committer Tony Luck Fri, 08 Sep 2006 11:06:06 -0700 [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 tree 083f41edca573e59cb773672867cd24027102014 parent 2636255488484e04d6d54303d2b0ec30f7ef7e02 author Jack Steiner Thu, 31 Aug 2006 11:34:47 -0500 committer Tony Luck Fri, 08 Sep 2006 11:05:13 -0700 [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 tree 09b682cacdd5b6ef392aa4a85999d87cefe1014d parent b8444d00762703e1b6146fce12ce2684885f8bf6 author Andreas Schwab Mon, 04 Sep 2006 21:56:09 +0200 committer Tony Luck Fri, 08 Sep 2006 11:03:40 -0700 [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 tree ea29e11313f63d9cc6aea0c2fd0179e9e3184a2a parent e9f7bee1df223dcf83743b46cb06c08d95497ec0 author Stephane Eranian Fri, 25 Aug 2006 14:00:19 -0700 committer Tony Luck Fri, 08 Sep 2006 10:59:14 -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 tree 67beae4733ef0286645112a52623c81c8f8a19a9 parent 016eb4a0ed06a3677d67a584da901f0e9a63c666 author Trond Myklebust Fri, 08 Sep 2006 09:48:54 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:51 -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 tree 574ead6bd03d31ca7036ff2389cb0400f3fd63fc parent 3665d0e58fa44f50c744f85c7e8ad21d5b10e206 author Andrew Morton Fri, 08 Sep 2006 09:48:38 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:50 -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 tree 7714916ca20e906d685f6b0886195692d3471f68 parent 47d4b9066df023670a61e74565a75293cf15a441 author Badari Pulavarty Fri, 08 Sep 2006 09:48:21 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:50 -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 tree 5306edd9f6669c85cfcfa30cba463265909f66c6 parent 67bb2c692cc02e53c23e4debc92c3a79ddc52a8c author David Wang Fri, 08 Sep 2006 09:47:51 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:50 -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 tree fbaca3deba2aba7ec8fa774d48b6cd19767b62ef parent 4495c9e5cabc82bb4ce930eb5d3dc7544f3f8389 author Alexey Dobriyan Fri, 08 Sep 2006 09:47:34 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:50 -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 tree 3e70a8e3d31a6665265e54f98d5f3d9554bdc547 parent c5780e976e19faff345fcef4a01db87108b51a44 author Alexey Dobriyan Fri, 08 Sep 2006 09:47:24 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:50 -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 tree 1e75fc4cd3765beb575fb3196a477d97ed1905a4 parent 3a459756810912d2c2bf188cef566af255936b4d author Thomas Gleixner Fri, 08 Sep 2006 09:47:15 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:50 -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 tree 1b52d90a2412811ebf5078b4f55112864e1890df parent 10387e5eb45c6e48d67102b88229f5bc6037461c author Kirill Korotaev Thu, 07 Sep 2006 14:17:04 +0400 committer Linus Torvalds Fri, 08 Sep 2006 08:40:46 -0700 [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 tree 6b5eb23a16c1a31f5785bfb9e8380d60f72269d3 parent eaede2cb75f8f8d492342e7c1469635237b32795 author Kai Lindhom Thu, 07 Sep 2006 21:25:51 +0200 committer Greg Kroah-Hartman Thu, 07 Sep 2006 15:23:04 -0700 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 tree 34e5c0496aac324f2c20884457be84bf3d231eba parent 3003b9f78920226367c2f2d3a5598397578a730b author Ralf Schlatterbeck Wed, 06 Sep 2006 12:15:02 +0200 committer Greg Kroah-Hartman Thu, 07 Sep 2006 15:23:04 -0700 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 tree e4b581aff6e3d3d4f9b78c9bc6bf0042d584ffe1 parent f064902457a775f7f70432832d67a5628c250456 author Nobuhiro Iwamatsu Fri, 01 Sep 2006 11:32:28 +0900 committer Greg Kroah-Hartman Thu, 07 Sep 2006 15:23:04 -0700 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 tree 32686001ddaf3f55f40e239f48bf8379e452db42 parent 10387e5eb45c6e48d67102b88229f5bc6037461c author Adrian Bunk Mon, 04 Sep 2006 13:41:10 +0200 committer Greg Kroah-Hartman Thu, 07 Sep 2006 15:23:03 -0700 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 tree 32af472c52ab5cfabe1a974fe1df92c164a337da parent d773d7255199a6c8934e197756f54a1115dd127b author Pierre Ossman Thu, 07 Sep 2006 16:01:30 +0100 committer Russell King Thu, 07 Sep 2006 16:01:30 +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 tree 940cb1f15be1d27508927ad40d0262fbec462437 parent 148f93d59cc9bb5e0f9a04d36a6f91d435e1a3f7 author Russell King Thu, 07 Sep 2006 15:57:12 +0100 committer Russell King Thu, 07 Sep 2006 15:57:12 +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 tree 1a413a79d37661199786f6fe2db3fe8bd7b5556a parent 385e3227d4d83ab13d7767c4bb3593b0256bf246 author Pavel Pisa Thu, 07 Sep 2006 15:53:29 +0100 committer Russell King Thu, 07 Sep 2006 15:53:29 +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 tree 91f532e07753c44a905116f5a7d0e3bdcfca7f0a parent f57b225e432d80ee46f48536cc55ea6cf62c5570 author Pierre Ossman Sun, 18 Jun 2006 14:34:37 +0200 committer Russell King Thu, 07 Sep 2006 13:18:40 +0100 [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 tree 7ae7851bd492c612ea3aa0b906c3df6f4fcdea60 parent 10387e5eb45c6e48d67102b88229f5bc6037461c author David Brownell Sun, 03 Sep 2006 06:43:33 -0700 committer Russell King Thu, 07 Sep 2006 13:18:40 +0100 [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 3142afb568d266765bde94f90b0dfee7e5cb08ce tree d3b24f1fcc1eb8157c956b5b6e2b11cea8d7b574 parent f854d37ab6b74f5a2d768d28e9583bc2991692c1 author Ben Dooks Wed, 06 Sep 2006 19:03:31 +0100 committer Russell King Wed, 06 Sep 2006 19:03:31 +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 tree 6dbebeab757df8e9222da63fc31ed85cd1fabe40 parent f64c2c01b74763c1c2be4d0dfb8b7f3f586fedb7 author Catalin Marinas Wed, 06 Sep 2006 19:03:28 +0100 committer Russell King Wed, 06 Sep 2006 19:03:28 +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 tree a7773d09d9d761cd08e3f092443a39c1b42e0cc0 parent 916a0021014d1b21b76c21793694978bbd69cf22 author Martin Michlmayr Wed, 06 Sep 2006 19:03:24 +0100 committer Russell King Wed, 06 Sep 2006 19:03:24 +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 tree dd5aba4c9620174090954e6602e5258374fee6d5 parent e89bc81103bb8798daae2c1871229620ed725657 author Ben Dooks Wed, 06 Sep 2006 19:03:21 +0100 committer Russell King Wed, 06 Sep 2006 19:03:21 +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 tree d5528a13524ef5d5be1a47cd2fe33f673bb84558 parent c336923b668fdcf0312efbec3b44895d713f4d81 author Catalin Marinas Wed, 06 Sep 2006 19:03:14 +0100 committer Russell King Wed, 06 Sep 2006 19:03:14 +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 10387e5eb45c6e48d67102b88229f5bc6037461c tree 77b305e7db8aa0b8b451c96f33aed66bf1a8a50f parent ebd6c17109aed086908ae3b0949265fd07712659 parent d279490543ee4e7c51371eb605b578ab47f45305 author Linus Torvalds Wed, 06 Sep 2006 11:00:59 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:59 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] myri10ge: update the firmware download URL in Kconfig commit ebd6c17109aed086908ae3b0949265fd07712659 tree 7a1af4b2ac8b6ce062206d0e967272d2ae457ff6 parent b4a228346c1a7d09f565e750d2e988c5671e9fa3 author john stultz Wed, 06 Sep 2006 11:02:45 +0100 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [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 tree 8e6340f140da2f0b59457f40ed4ee6dc6dee6f6b parent bb98ad77d8451a3ccf9478738ffe7ec63394fcdf author David Woodhouse Wed, 06 Sep 2006 09:03:26 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] Remove unneeded asm-i386/cpufeature.h from user visibility. Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit bb98ad77d8451a3ccf9478738ffe7ec63394fcdf tree f642ce106f26e5ff13d6994555425a084f906b56 parent 068c4579fe5c21e84c7cb2ba89db80899e25104e author Ismail Donmez Wed, 06 Sep 2006 00:03:44 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -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 tree ab16bf723c648d936cefb89b6dc6634145668b86 parent 471b40d0dfc17bf0161629950b82524d41bc37ce author Ingo Molnar Wed, 06 Sep 2006 00:03:44 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -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 tree 1f3a95ec7a182e313556afe16d8107444d090fa8 parent 96dd7421a06a5bc6eb731323b95efcb2fd864854 author Pavel Machek Wed, 06 Sep 2006 00:03:43 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -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 tree a450951e439f897ee92ba6b068efb77c0edc6a1a parent fe2bbc4832659b7ffc867cac03e0a92ae81e11e4 author Thomas Gleixner Wed, 06 Sep 2006 00:03:42 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -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 tree 9c0ece0fd67295acb4230d1f9da729db26a00a48 parent 6dba28379edc08327ede01ff41bd3c9dd46a7fa0 author Henrik Kretzschmar Wed, 06 Sep 2006 00:03:41 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:01 -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 tree 945418feebb2dcf4387ce86bf57a6c4f757e7b43 parent fc47e7b592dc45b03c27b0a4c8f2d215dae9944d author Henrik Kretzschmar Wed, 06 Sep 2006 00:03:40 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:01 -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 tree 54ea55d491e2f708bc23655041668e19da3de619 parent c336923b668fdcf0312efbec3b44895d713f4d81 author Jarek Poplawski Wed, 06 Sep 2006 00:03:39 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:01 -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 tree 45217be4f3e2b6938d7b330cda6eb0a9a2cedf12 parent c336923b668fdcf0312efbec3b44895d713f4d81 author Brice Goglin Tue, 05 Sep 2006 21:58:50 -0400 committer Jeff Garzik Wed, 06 Sep 2006 11:04:26 -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