commit ce4796d1e16cf3761dc2a02b8d588667d05b3078 Merge: 46fbdf8... 7b9726a... Author: Linus Torvalds Date: Thu Mar 6 19:32:33 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25: sh: Fix up the sh64 build. sh: Fix up SH7710 VoIP-GW build. sh: Flag PMB support as EXPERIMENTAL. sh: Update r7780mp defconfig. fb: hitfb: Balance probe/remove section annotations. sh: hp6xx: Fix up hp6xx_apm build failure. fb: pvr2fb: Fix up remaining section mismatch. sh: Fix up section mismatches. sh: hp6xx: Correct APM output. sh: update se7780 defconfig sh: replace remaining __FUNCTION__ occurrences sh: export copy-page() to modules sh_ksyms_32.c update for gcc 4.3 sh/mm/pg-sh7705.c must #include commit 46fbdf8935544dcde440bd807b50e52ed2ca7f3b Merge: a086313... 9821b1f... Author: Linus Torvalds Date: Thu Mar 6 19:32:05 2008 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: [Blackfin] arch: current_l1_stack_save is a pointer, so use NULL rather than 0 [Blackfin] arch: fix atomic and32/xor32 comments and ENDPROC markings [Blackfin] arch: fix bug - allow SDH driver to be used as module [Blackfin] arch: to kill syscalls missing warning by adding new timerfd syscalls commit a0863130757f32df602c1c60326530c0152b626b Merge: b881502... 45e18c2... Author: Linus Torvalds Date: Thu Mar 6 19:31:34 2008 -0800 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] kprobes arch consolidation build fix [IA64] update efi region debugging to use MB, GB and TB as well as KB [IA64] use dev_printk in video quirk [IA64] remove remaining __FUNCTION__ occurrences [IA64] remove unnecessary nfs includes from sys_ia32.c [IA64] remove CONFIG_SMP ifdef in ia64_send_ipi() [IA64] arch_ptrace() cleanup [IA64] remove duplicate code from arch_ptrace() [IA64] convert sys_ptrace to arch_ptrace [IA64] remove find_thread_for_addr() [IA64] do not sync RBS when changing PT_AR_BSP or PT_CFM [IA64] access user RBS directly commit 45e18c228e131592a922859e1525770a1803191d Author: Harvey Harrison Date: Thu Mar 6 09:49:01 2008 -0800 [IA64] kprobes arch consolidation build fix ia64 named their handler kprobes_fault_handler while all other arches used kprobe_fault_handler. Change the function definition and header declaration. Signed-off-by: Harvey Harrison Signed-off-by: Tony Luck commit 818c7e866f920b145424c2c46deda4b27c3fb316 Author: Simon Horman Date: Tue Feb 26 15:24:04 2008 +0900 [IA64] update efi region debugging to use MB, GB and TB as well as KB When EFI_DEBUG is defined to a non-zero value in arch/ia64/kernel/efi.c, the efi memory regions are displayed. This patch enhances the display code in a few ways: 1. Use TB, GB and MB as well as KB as units. Although this introduces rounding errors (KB doesn't as size is always a multiple of 4Kb), it does make things a lot more readable. Also as the range is also shown, it is possible to note the exact size if it is important. In my experience, the size field is mostly useful for getting a general idea of the size of a region. On the rx2620 that I use, there actually is an 8TB region (though not backed by physical memory, and 8TB really is a lot more readable than 8589934592KB. 2. pad the size field with leading spaces to further improve readability ... ... ( 8MB) ... ( 928MB) ... ( 3MB) ... vs ... ... (8MB) ... (928MB) ... (3MB) ... 3. Pad the attr field out to 64bits using leading zeros, to further improve readability. ... mem05: type= 2, attr=0x0000000000000008, range=[0x0000000004000000-0x000000000481f000) ( 8MB) mem06: type= 7, attr=0x0000000000000008, range=[0x000000000481f000-0x000000003e876000) ( 928MB) mem07: type= 5, attr=0x8000000000000008, range=[0x000000003e876000-0x000000003eb8e000) ( 3MB) mem08: type= 4, attr=0x0000000000000008, range=[0x000000003eb8e000-0x000000003ee7a000) ( 2MB) ... ... mem05: type= 2, attr=0x8, range=[0x0000000004000000-0x000000000481f000) ( 8MB) mem06: type= 7, attr=0x8, range=[0x000000000481f000-0x000000003e876000) ( 928MB) mem07: type= 5, attr=0x8000000000000008, range=[0x000000003e876000-0x000000003eb8e000) ( 3MB) mem08: type= 4, attr=0x8, range=[0x000000003eb8e000-0x000000003ee7a000) ( 2MB) ... 4. Use %d instead of %u for the index field, as i is a signed int. N.B: This code is not compiled unless EFI_DEBUG is non 0. Signed-off-by: Simon Horman Signed-off-by: Tony Luck commit 1ab40ec8f227a2b278a5151e60b7070a8bf5546d Author: Bjorn Helgaas Date: Tue Mar 4 16:34:57 2008 -0700 [IA64] use dev_printk in video quirk Convert quirk printks to dev_printk(). Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit d4ed80841ad4a1d59decccfbe2d010558568c5fb Author: Harvey Harrison Date: Tue Mar 4 15:15:00 2008 -0800 [IA64] remove remaining __FUNCTION__ occurrences __FUNCTION__ is gcc-specific, use __func__ Long lines have been kept where they exist, some small spacing changes have been done. Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 2d9b06c72a9f2e6042d72df7d9000a48bcba34f0 Author: KOSAKI Motohiro Date: Tue Mar 4 15:45:42 2008 -0800 [IA64] remove unnecessary nfs includes from sys_ia32.c Compilation of 2.6.25-rc2-mm1 on ia64 generates many warnings. IA64 support 2 ELF format (IA64 binary and IA32 binary), thus if 2 elf related header included, cause many warning or error. about 2 week ago, J. Bruce Fields proposed this problem fixed patch. (http://marc.info/?l=linux-ia64&m=120329313305695&w=2) Signed-off-by: J. Bruce Fields Signed-off-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit cd3244e605efeb13bb3a6e92439974832e1c7388 Author: Bjorn Helgaas Date: Wed Mar 5 15:40:32 2008 -0700 [IA64] remove CONFIG_SMP ifdef in ia64_send_ipi() When !CONFIG_SMP, cpu_physical_id() is ia64_get_lid(), which is functionally identical to (ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff so there's no need for two versions of this code. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit b881502666783b2d9ca2fc7a056d0f773073a808 Merge: 910da1a... 2f40a17... Author: Linus Torvalds Date: Thu Mar 6 08:14:18 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] xcbc: Fix crash with IPsec [CRYPTO] xts: Use proper alignment [CRYPTO] digest: Include internal.h for prototypes [CRYPTO] authenc: Add missing Kconfig dependency on BLKCIPHER [CRYPTO] skcipher: Move chainiv/seqiv into crypto_blkcipher module commit 910da1a48eeb3be53a8247f6c494aa9d67ab1422 Merge: 2ab42e2... 72772a3... Author: Linus Torvalds Date: Thu Mar 6 08:14:00 2008 -0800 Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] fix inode leak in xfs_iget_core() [XFS] 977545 977545 977545 977545 977545 977545 xfsaild causing too many commit 2ab42e24d63193d78f2e888a170b208f4776aaba Author: David Woodhouse Date: Thu Mar 6 10:57:54 2008 +0000 Really unexport asm/page.h Commit ed7b1889da256977574663689b598d88950bbd23 removed page.h from include/asm-generic/Kbuild so that it shouldn't get exported. However, it was redundantly listed in asm-mn10300/Kbuild and asm-x86/Kbuild too. Remove those as well, so it really stops being exported on those architectures. Also remove the redundant listing of ptrace.h and termios.h from mn10300. Signed-off-by: David Woodhouse Acked-by: David Howells Signed-off-by: Linus Torvalds commit 2f40a178e70030c4712fe63807c883f34c3645eb Author: Joy Latten Date: Thu Mar 6 19:28:44 2008 +0800 [CRYPTO] xcbc: Fix crash with IPsec When using aes-xcbc-mac for authentication in IPsec, the kernel crashes. It seems this algorithm doesn't account for the space IPsec may make in scatterlist for authtag. Thus when crypto_xcbc_digest_update2() gets called, nbytes may be less than sg[i].length. Since nbytes is an unsigned number, it wraps at the end of the loop allowing us to go back into loop and causing crash in memcpy. I used update function in digest.c to model this fix. Please let me know if it looks ok. Signed-off-by: Joy Latten Signed-off-by: Herbert Xu commit 6212f2c7f70c591efb0d9f3d50ad29112392fee2 Author: Sebastian Siewior Date: Thu Mar 6 18:56:19 2008 +0800 [CRYPTO] xts: Use proper alignment The XTS blockmode uses a copy of the IV which is saved on the stack and may or may not be properly aligned. If it is not, it will break hardware cipher like the geode or padlock. This patch encrypts the IV in place so we don't have to worry about alignment. Signed-off-by: Sebastian Siewior Tested-by: Stefan Hellermann Signed-off-by: Herbert Xu commit 7b9726a7a0d8c70ea44a5ed23726748de344f223 Author: Paul Mundt Date: Thu Mar 6 17:23:15 2008 +0900 sh: Fix up the sh64 build. Signed-off-by: Paul Mundt commit e7d7deca60c01d844a4d8e5644f4aecaf0e3bee4 Author: Paul Mundt Date: Thu Mar 6 16:08:00 2008 +0900 sh: Fix up SH7710 VoIP-GW build. The only board-specific bits that existed here were for setting up the IRQs, which are now handled by the SH7710 CPU support code instead. As there's nothing else to do for setup, kill off the board support code and have the defconfig use the generic machvec instead. Signed-off-by: Paul Mundt commit 2af8b3b642ea2a9442890797ad5f92d2eaacb5b5 Author: Paul Mundt Date: Thu Mar 6 16:06:38 2008 +0900 sh: Flag PMB support as EXPERIMENTAL. There's still work that needs to be done here, and this should not be enabled by default on existing boards. Signed-off-by: Paul Mundt commit 149b91e10769564711669adfff0f8af213d47ea8 Author: Paul Mundt Date: Thu Mar 6 16:03:58 2008 +0900 sh: Update r7780mp defconfig. This disables the PMB/32BIT=y by default in r7780mp, as turning this on presently results in build errors (for an admittedly experimental feature). Signed-off-by: Paul Mundt commit 72772a3b5b158cddcfbbff3ef13b26b03a905158 Author: David Chinner Date: Thu Mar 6 13:49:43 2008 +1100 [XFS] fix inode leak in xfs_iget_core() If the radix_tree_preload() fails, we need to destroy the inode we just read in before trying again. This could leak xfs_vnode structures when there is memory pressure. Noticed by Christoph Hellwig. SGI-PV: 977823 SGI-Modid: xfs-linux-melb:xfs-kern:30606a Signed-off-by: David Chinner Signed-off-by: Lachlan McIlroy Signed-off-by: Christoph Hellwig commit 92d9cd1059f80b9c89dee191ffb88b0872e6a7ae Author: David Chinner Date: Thu Mar 6 13:45:10 2008 +1100 [XFS] 977545 977545 977545 977545 977545 977545 xfsaild causing too many wakeups Idle state is not being detected properly by the xfsaild push code. The current idle state is detected by an empty list which may never happen with mostly idle filesystem or one using lazy superblock counters. A single dirty item in the list that exists beyond the push target can result repeated looping attempting to push up to the target because it fails to check if the push target has been acheived or not. Fix by considering a dirty list with everything past the target as an idle state and set the timeout appropriately. SGI-PV: 977545 SGI-Modid: xfs-linux-melb:xfs-kern:30532a Signed-off-by: David Chinner Signed-off-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy commit 0f8afa7ca9117276e9519239ed0553be2f04d269 Author: Paul Mundt Date: Thu Mar 6 13:56:33 2008 +0900 fb: hitfb: Balance probe/remove section annotations. hitfb presently has probe using __init whilst remove uses __devexit. As this device can't possibly be hotplugged, switch to __exit and __exit_p() instead. Signed-off-by: Paul Mundt commit dd4f99b42dcce8f84ff6b8ec3d375b54a0785c7e Author: Paul Mundt Date: Thu Mar 6 13:48:08 2008 +0900 sh: hp6xx: Fix up hp6xx_apm build failure. Signed-off-by: Paul Mundt commit fcb1fec7fece6b9889deaedf5b7d21f4f5a26381 Author: Paul Mundt Date: Thu Mar 6 13:39:18 2008 +0900 fb: pvr2fb: Fix up remaining section mismatch. Building with CONFIG_DEBUG_SECTION_MISMATCH=y reports: CC drivers/video/pvr2fb.o LD drivers/video/built-in.o WARNING: drivers/video/built-in.o(.text+0xb9b0): Section mismatch in reference from the function pvr2fb_check_var() to the variable .devinit.data:pvr2_fix The function pvr2fb_check_var() references the variable __devinitdata pvr2_fix. This is often because pvr2fb_check_var lacks a __devinitdata annotation or the annotation of pvr2_fix is wrong. This is obviously crap as no such reference exists, but it's a bit closer to reality from older versions which blamed the PCI table. The real problem was a reference to pvr2_var.vmode from pvr2fb_check_var(), as pvr2_var is flagged as __devinitdata (pvr2_fix is also, so at least that part is right). pvr2_var.vmode is just a fancy way of saying FB_VMODE_NONINTERLACED, so we just reference that explicitly instead. Signed-off-by: Paul Mundt commit b2839ed83f54d40870747ac8d655504dff63d1c5 Author: Paul Mundt Date: Thu Mar 6 12:43:38 2008 +0900 sh: Fix up section mismatches. Signed-off-by: Paul Mundt commit 8b03c040e4efaaad3fc09f07f6af6e449205c75a Author: Kristoffer Ericson Date: Tue Mar 4 23:09:25 2008 -0800 sh: hp6xx: Correct APM output. This patch fixes the old non-verbose hp6xx apm code and enables some very basic apm output. We now get percentage (battery) output and basic time estimate. Signed-off-by: Kristoffer Ericson Signed-off-by: Paul Mundt commit 56546b18969eb808af0c1a6ff68988678bd0a8b7 Author: goda.yusuke Date: Thu Feb 28 12:53:23 2008 +0900 sh: update se7780 defconfig This patch updates se7780_defconfig Signed-off-by: Yusuke Goda Signed-off-by: Paul Mundt commit 866e6b9e5019e210d96ced31fbae531ed756e486 Author: Harvey Harrison Date: Tue Mar 4 15:23:47 2008 -0800 sh: replace remaining __FUNCTION__ occurrences __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit ad0caae0ded1af2a0a41f93356587e1c24d76725 Author: Andrew Morton Date: Tue Mar 4 15:23:47 2008 -0800 sh: export copy-page() to modules ERROR: "copy_page" [fs/unionfs/unionfs.ko] undefined! like all the other architectures. Cc: Erez Zadok Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit 4bee4ca2de533947720db14276828e1a066b940d Author: Adrian Bunk Date: Wed Mar 5 00:39:58 2008 +0200 sh_ksyms_32.c update for gcc 4.3 This patch fixes the following build error with landisk_defconfig when using gcc 4.3: <-- snip --> ... MODPOST 50 modules ERROR: "__udivsi3_i4i" [net/sunrpc/sunrpc.ko] undefined! ERROR: "__udivsi3_i4i" [net/appletalk/appletalk.ko] undefined! ERROR: "__udivsi3_i4i" [fs/ufs/ufs.ko] undefined! ERROR: "__udivsi3_i4i" [fs/ntfs/ntfs.ko] undefined! ERROR: "__sdivsi3_i4i" [fs/ntfs/ntfs.ko] undefined! ERROR: "__udivsi3_i4i" [fs/nfsd/nfsd.ko] undefined! ERROR: "__sdivsi3_i4i" [fs/nfsd/nfsd.ko] undefined! ERROR: "__udivsi3_i4i" [fs/nfs/nfs.ko] undefined! ERROR: "__udivsi3_i4i" [fs/lockd/lockd.ko] undefined! ERROR: "__udivsi3_i4i" [drivers/usb/storage/usb-storage.ko] undefined! ERROR: "__sdivsi3_i4i" [drivers/usb/serial/pl2303.ko] undefined! ERROR: "__udivsi3_i4i" [drivers/usb/serial/pl2303.ko] undefined! ERROR: "__sdivsi3_i4i" [drivers/usb/serial/ftdi_sio.ko] undefined! ERROR: "__udivsi3_i4i" [drivers/usb/misc/sisusbvga/sisusbvga.ko] undefined! ERROR: "__sdivsi3_i4i" [drivers/usb/misc/sisusbvga/sisusbvga.ko] undefined! ERROR: "__udivsi3_i4i" [drivers/media/video/v4l1-compat.ko] undefined! ERROR: "__sdivsi3_i4i" [drivers/media/video/v4l1-compat.ko] undefined! ERROR: "__sdivsi3_i4i" [drivers/media/video/usbvideo/vicam.ko] undefined! ERROR: "__udivsi3_i4i" [drivers/media/video/usbvideo/usbvideo.ko] undefined! ERROR: "__sdivsi3_i4i" [drivers/media/video/usbvideo/usbvideo.ko] undefined! ERROR: "__udivsi3_i4i" [drivers/media/video/sn9c102/sn9c102.ko] undefined! ERROR: "__sdivsi3_i4i" [drivers/media/video/sn9c102/sn9c102.ko] undefined! ERROR: "__sdivsi3_i4i" [drivers/media/video/se401.ko] undefined! ERROR: "__sdivsi3_i4i" [drivers/media/video/pwc/pwc.ko] undefined! ERROR: "__udivsi3_i4i" [drivers/md/raid0.ko] undefined! ERROR: "__udivsi3_i4i" [drivers/md/md-mod.ko] undefined! ERROR: "__sdivsi3_i4i" [drivers/md/md-mod.ko] undefined! ERROR: "__udivsi3_i4i" [drivers/md/linear.ko] undefined! ERROR: "__sdivsi3_i4i" [drivers/hid/usbhid/usbhid.ko] undefined! make[2]: *** [__modpost] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Paul Mundt commit c31f2f3d066d49147ce297c7207cc2d49dd20382 Author: Adrian Bunk Date: Mon Mar 3 20:07:42 2008 +0200 sh/mm/pg-sh7705.c must #include This patch fixes the following compile error: <-- snip --> ... CC arch/sh/mm/pg-sh7705.o /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/mm/pg-sh7705.c: In function 'ptep_get_and_clear': /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/mm/pg-sh7705.c:130: error: implicit declaration of function 'mapping_writably_mapped' make[2]: *** [arch/sh/mm/pg-sh7705.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Paul Mundt commit 9821b1f4a145b20db08108362f0b4caf4f0832a1 Author: Mike Frysinger Date: Wed Mar 5 19:02:23 2008 -0700 [Blackfin] arch: current_l1_stack_save is a pointer, so use NULL rather than 0 Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit d7fe321eeba58f0a37cc4324d10e52092be457e0 Merge: 4a0d3f3... f7f0283... Author: Linus Torvalds Date: Wed Mar 5 18:00:22 2008 -0800 Merge branch 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6 * 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6: UBI: mtd/ubi/vtbl.c: fix memory leak UBI: fix sparse errors in ubi.h UBI: fix error message UBI: silence warning commit 4a0d3f3afddf01dfcfdcc826f0b706dbc01f4ef4 Author: FUJITA Tomonori Date: Wed Mar 5 17:09:30 2008 +0900 parisc: fix IOMMU's device boundary overflow bug on 32bits arch On 32bits boxes, boundary_size becomes zero due to a overflow and we hit BUG_ON in iommu_is_span_boundary. Signed-off-by: FUJITA Tomonori Cc: Kyle McMartin Cc: Matthew Wilcox Acked-by: Grant Grundler Signed-off-by: Linus Torvalds commit 41f7f60d31e5e1dfc9a92957b3e14e08a2f04964 Author: David Rientjes Date: Tue Mar 4 23:32:38 2008 -0800 cpusets: fix obsolete comment mm migration is no longer done in cpuset_update_task_memory_state() so it can no longer take current->mm->mmap_sem, so fix the obsolete comment. [ This changed in commit 04c19fa6f16047abff2288ddbc1f0798ede5a849 ("cpuset: migrate all tasks in cpuset at once") when the mm migration was moved from cpuset_update_task_memory_state() to update_nodemask() ] Signed-off-by: David Rientjes Cc: Paul Jackson Signed-off-by: Linus Torvalds commit 103926c689650396901002c3a8c38970fff70391 Merge: da71aeb... 51f39ea... Author: Linus Torvalds Date: Wed Mar 5 17:49:59 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (27 commits) [SCSI] mpt fusion: don't oops if NumPhys==0 [SCSI] iscsi class: regression - fix races with state manipulation and blocking/unblocking [SCSI] qla4xxx: regression - add start scan callout [SCSI] qla4xxx: fix host reset dpc race [SCSI] tgt: fix build errors when dprintk is defined [SCSI] tgt: set the data length properly [SCSI] tgt: stop zero'ing scsi_cmnd [SCSI] ibmvstgt: set up scsi_host properly before __scsi_alloc_queue [SCSI] docbook: fix fusion source files [SCSI] docbook: fix scsi source file [SCSI] qla2xxx: Update version number to 8.02.00-k9. [SCSI] qla2xxx: Correct usage of inconsistent timeout values while issuing ELS commands. [SCSI] qla2xxx: Correct discrepancies during OVERRUN handling on FWI2-capable cards. [SCSI] qla2xxx: Correct needless clean-up resets during shutdown. [SCSI] arcmsr: update version and changelog [SCSI] ps3rom: disable clustering [SCSI] ps3rom: fix wrong resid calculation bug [SCSI] mvsas: fix phy sas address [SCSI] gdth: fix to internal commands execution [SCSI] gdth: bugfix for the at-exit problems ... commit da71aeb6149cf6c9c98b8ff2ce1c2ae93dbcfa75 Merge: 9af6b05... f9c3a38... Author: Linus Torvalds Date: Wed Mar 5 17:49:38 2008 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: NFS: use new LSM interfaces to explicitly set mount options LSM/SELinux: Interfaces to allow FS to control mount options commit 9af6b056a281c81ae6043e0f5b4e2cb323f5bb43 Merge: 8cce3e7... f6ebef3... Author: Linus Torvalds Date: Wed Mar 5 17:49:01 2008 -0800 Merge branch 'fixes-25' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'fixes-25' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] fix section mismatch warnings [CPUFREQ] Remove debugging message from e_powersaver [CPUFREQ] Fix missing cpufreq_cpu_put() call in ->store [CPUFREQ] Fix missing cpufreq_cpu_put() call in ->show commit 8cce3e7cbe6f09553bfd94250f0a358ba669c8ac Merge: a878539... 583b33b... Author: Linus Torvalds Date: Wed Mar 5 17:47:41 2008 -0800 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] incorrect reipl nss name. [S390] Load disabled wait psw if reipl fails. [S390] Fix IPL from NSS. [S390] zcrypt: fix ap_device_list handling [S390] sclp_vt220: speed up console output for interactive work [S390] dasd: fix reference counting in display method for proc/dasd/devices [S390] dasd: let dasd erp matching recognize alias recovery [S390] Get rid of memcpy gcc warning workaround. [S390] idle: Fix machine check handling in idle loop. [S390] Update default configuration. commit aa17f6f930b19df2901aa78c88530653cdcfc450 Author: Petr Tesarik Date: Tue Feb 26 12:03:28 2008 +0100 [IA64] arch_ptrace() cleanup Remove duplicate code, clean up goto's and indentation. Signed-off-by: Petr Tesarik Signed-off-by: Tony Luck commit 8db3f5254151c3a06a764bbb18283570ba1897bf Author: Petr Tesarik Date: Mon Feb 11 22:43:38 2008 +0100 [IA64] remove duplicate code from arch_ptrace() Remove all code which does exactly the same thing as ptrace_request(). Signed-off-by: Petr Tesarik Signed-off-by: Tony Luck commit eac738e6cea16bfbd7b9018d60d009aedd2d14b6 Author: Petr Tesarik Date: Mon Feb 11 22:43:05 2008 +0100 [IA64] convert sys_ptrace to arch_ptrace Convert sys_ptrace() to arch_ptrace(). Signed-off-by: Petr Tesarik Signed-off-by: Tony Luck commit e868a55c2a8cb72b66d7137fbcc54b82016e98eb Author: Petr Tesarik Date: Mon Feb 11 22:42:34 2008 +0100 [IA64] remove find_thread_for_addr() find_thread_for_addr() is no longer needed. It was only used to find the correct kernel RBS for a given memory address, but since the kernel RBS is not needed any longer, this function can go away. Signed-off-by: Petr Tesarik Signed-off-by: Tony Luck commit 08b23d74e07ac053fe4a5d6f4a48e8048fcfe52b Author: Petr Tesarik Date: Mon Feb 11 22:42:00 2008 +0100 [IA64] do not sync RBS when changing PT_AR_BSP or PT_CFM Syncing is no longer needed, because user RBS is already up-to-date. Actually, if a debugger modified the contents of the original RBS prior to changing PT_AR_BSP, the modifications would get overwritten. Signed-off-by: Petr Tesarik Signed-off-by: Tony Luck commit 972559a05222c1d7ebd5dcde637542713bb8778d Author: Petr Tesarik Date: Mon Feb 11 22:41:18 2008 +0100 [IA64] access user RBS directly Because the user RBS of a process is now completely stored in user-mode when the process is ptrace-stopped, accesses to the RBS should no longer augment any part of the kernel RBS. This means we can get rid of most ia64_peek() and ia64_poke() calls. Signed-off-by: Petr Tesarik Signed-off-by: Tony Luck commit f9c3a3802119a2d30f3e4a69aef30a81e09d0209 Author: Eric Paris Date: Wed Mar 5 14:20:18 2008 -0500 NFS: use new LSM interfaces to explicitly set mount options NFS and SELinux worked together previously because SELinux had NFS specific knowledge built in. This design was approved by both groups back in 2004 but the recent NFS changes to use nfs_parsed_mount_data and the usage of nfs_clone_mount_data showed this to be a poor fragile solution. This patch fixes the NFS functionality regression by making use of the new LSM interfaces to allow an FS to explicitly set its own mount options. The explicit setting of mount options is done in the nfs get_sb functions which are called before the generic vfs hooks try to set mount options for filesystems which use text mount data. This does not currently support NFSv4 as that functionality did not exist in previous kernels and thus there is no regression. I will be adding the needed code, which I believe to be the exact same as the v3 code, in nfs4_get_sb for 2.6.26. Signed-off-by: Eric Paris Acked-by: Trond Myklebust Signed-off-by: James Morris commit e0007529893c1c064be90bd21422ca0da4a0198e Author: Eric Paris Date: Wed Mar 5 10:31:54 2008 -0500 LSM/SELinux: Interfaces to allow FS to control mount options Introduce new LSM interfaces to allow an FS to deal with their own mount options. This includes a new string parsing function exported from the LSM that an FS can use to get a security data blob and a new security data blob. This is particularly useful for an FS which uses binary mount data, like NFS, which does not pass strings into the vfs to be handled by the loaded LSM. Also fix a BUG() in both SELinux and SMACK when dealing with binary mount data. If the binary mount data is less than one page the copy_page() in security_sb_copy_data() can cause an illegal page fault and boom. Remove all NFSisms from the SELinux code since they were broken by past NFS changes. Signed-off-by: Eric Paris Acked-by: Stephen Smalley Acked-by: Casey Schaufler Signed-off-by: James Morris commit 51f39eae14b4874618e73281c236e3a1c1572d4d Author: Krzysztof Oledzki Date: Tue Mar 4 14:56:23 2008 -0800 [SCSI] mpt fusion: don't oops if NumPhys==0 Don't oops if NumPhys==0, instead return -ENODEV. This patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=9909 Signed-off-by: Krzysztof Piotr Oledzki Acked-by: Eric Moore Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit f6ebef30e21638417f8f5443ba393d63a0c27e2b Author: Sam Ravnborg Date: Sun Feb 17 13:22:52 2008 +0100 [CPUFREQ] fix section mismatch warnings Fix the following warnings: WARNING: vmlinux.o(.text+0xfe6711): Section mismatch in reference from the function cpufreq_unregister_driver() to the variable .cpuinit.data:cpufreq_cpu_notifier WARNING: vmlinux.o(.text+0xfe68af): Section mismatch in reference from the function cpufreq_register_driver() to the variable .cpuinit.data:cpufreq_cpu_notifier WARNING: vmlinux.o(.exit.text+0xc4fa): Section mismatch in reference from the function cpufreq_stats_exit() to the variable .cpuinit.data:cpufreq_stat_cpu_notifier The warnings were casued by references to unregister_hotcpu_notifier() from normal functions or exit functions. This is flagged by modpost as a potential error because it does not know that for the non HOTPLUG_CPU scenario the unregister_hotcpu_notifier() is a nop. Silence the warning by replacing the __initdata annotation with a __refdata annotation. Signed-off-by: Sam Ravnborg Signed-off-by: Dave Jones commit 0e5aa8d6218f9914b23e492debf653bda5598af3 Author: Dave Jones Date: Fri Feb 15 18:11:14 2008 -0500 [CPUFREQ] Remove debugging message from e_powersaver We don't need to printk a message every time we transition. Leave the code there, but ifdef'd out, as it's useful when adding support for new processors. Reported-by: Petr Titěra Signed-off-by: Dave Jones commit a07530b44547a892dae59f4e0f141f4e6f5e2e40 Author: Dave Jones Date: Wed Mar 5 14:22:25 2008 -0500 [CPUFREQ] Fix missing cpufreq_cpu_put() call in ->store refactor to use gotos instead of explicit exit paths Signed-off-by: Dave Jones commit 0db4a8a99f6a8534c526e8c9d4b13d098400d485 Author: Dave Jones Date: Wed Mar 5 14:20:57 2008 -0500 [CPUFREQ] Fix missing cpufreq_cpu_put() call in ->show refactor to use gotos instead of explicit exit paths Signed-off-by: Dave Jones commit 45ab33b6c190c4a8c58f1d13be2ff89ee62024ba Author: Mike Christie Date: Tue Mar 4 13:26:55 2008 -0600 [SCSI] iscsi class: regression - fix races with state manipulation and blocking/unblocking For qla4xxx, we could be starting a session, but some error (network, target, IO from a device that got started, etc) could cause the session to fail and curring the block/unblock and state manipulation could race with each other. This patch just has those operations done in the single threaded iscsi eh work queue, so that way they are serialized. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 024f801f528220edc89275a724ea00cd18c5ebb7 Author: Mike Christie Date: Tue Mar 4 13:26:54 2008 -0600 [SCSI] qla4xxx: regression - add start scan callout We are seeing EXIST errors from sysfs during device addition. We need a start scan callout so we do not start scanning sessions found during hba setup, before the async scsi scan code is ready. Signed-off-by: Mike Christie Acked-by: David C Somayajulu Signed-off-by: James Bottomley commit 50a29aec9c47d26e869df83ef1d69e3b63c83bf4 Author: Mike Christie Date: Tue Mar 4 13:26:53 2008 -0600 [SCSI] qla4xxx: fix host reset dpc race The host reset callout could be starting to reset the hba at the same time the dpc thread is. This creates lots of problems because they both want to do wierd things with the firmware and interrupts, etc. This patch just has the host reset function fully shutdown the dpc thread before resetting the hba. This patch also moves the setting of the session online bit to fix a potential race with the dpc thread and iscsi recovery thread. Signed-off-by: Mike Christie Acked-by: David C Somayajulu Signed-off-by: James Bottomley commit a878539ef994787c447a98c2e3ba0fe3dad984ec Author: Jeff Garzik Date: Thu Feb 28 15:43:48 2008 -0500 ahci: work around ATI SB600 h/w quirk This addresses the recent ATI SB600 errata, where the hardware does not like 256-length PRD entries during FPDMA (aka NCQ). It hurts performance on SB600, but it is more important to get a correct patch eliminating the data corruption/lockups, and then later on tune for performance. We simply limit each command to a maximum of 255 sectors, on SB600. Signed-off-by: Jeff Garzik commit 6ddd68615ae9b21096545d7d6ab0f04113ae8b42 Author: Alan Cox Date: Tue Feb 26 13:35:54 2008 -0800 pata_hpt*, pata_serverworks: fix UDMA masking When masking, mask out the modes that are unsupported not the ones that are supported. This makes life happier. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 583b33bc83d24791f11e862290ee0b79d804d2d8 Author: Hongjie Yang Date: Wed Mar 5 12:37:16 2008 +0100 [S390] incorrect reipl nss name. /sys/firmware/reipl/nss/name contains the nss name when defsys or savesys command has been executed. If the defsys or savesys command fails the kernel_nss_name has to be cleared since a reipl on that nss name won't be possible. Signed-off-by: Hongjie Yang Signed-off-by: Martin Schwidefsky commit 208e559155c775ba63e9f6fe59ac6d1e15711d28 Author: Michael Holzheu Date: Wed Mar 5 12:37:15 2008 +0100 [S390] Load disabled wait psw if reipl fails. Normally this should not happen, but it's cleaner to do it that way. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 684de39bd7957bfb1657a13ccb0c53a474708f2f Author: Heiko Carstens Date: Wed Mar 5 12:37:14 2008 +0100 [S390] Fix IPL from NSS. IPL from NSS didn't work because the memory detection routine omits any memory sections with a size lower than what MAX_ORDER defines. This causes the detection routine to skip the first memory segment which has a size of 1MB. Which later on will let the kernel think that there is no memory available at all. Since in addition the z/VM memory increment size is 1MB force MAX_ORDER to be 9, so we can support 1MB segments. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit faa582ca8014d2e1ede5568a813fb0e5c3c078df Author: Ralph Wuerthner Date: Wed Mar 5 12:37:13 2008 +0100 [S390] zcrypt: fix ap_device_list handling In ap_device_probe() we can add the new ap device to the internal device list only if the device probe function successfully returns. Otherwise we might end up with an invalid device in the internal ap device list. Signed-off-by: Ralph Wuerthner Signed-off-by: Martin Schwidefsky commit fa331ffc56fb8ead0811a89e4a582bbd5f29d714 Author: Christian Borntraeger Date: Wed Mar 5 12:37:12 2008 +0100 [S390] sclp_vt220: speed up console output for interactive work Currently an output buffer can wait up to HZ/2 until the buffer is flushed. The wait time is noticeable in interactive tools like mc. Change the value to HZ/20, which seems enough for interactive work. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit a5e2383991ee985332854b721ba3e5abbbabf0f2 Author: Stefan Weinhuber Date: Wed Mar 5 12:37:11 2008 +0100 [S390] dasd: fix reference counting in display method for proc/dasd/devices Using the /proc/dasd/devices interface leaves the reference counter of alias devices in an inconsistent state. A process that tries to set such a device offline afterwards will hang. The dasd_devices_show function returns immediately for alias devices and this code path was missing a dasd_put_device call. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit 5c12f2406cea24a2c885a8d3e5aa7ab94c65f0d5 Author: Stefan Weinhuber Date: Wed Mar 5 12:37:10 2008 +0100 [S390] dasd: let dasd erp matching recognize alias recovery When a request fails that was started on an alias device then the first recovery step is to retry it on the base device. If the recovery request fails again with the same symptoms, the next step should not be a simple retry, but should be a proper recovery based on sense data, etc. To do so, the dasd recovery functions need to recognize the alias recovery step in the erp chain by comparing the start devices. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit 98c7b388afffdc5699095261b437b286d718270c Author: Heiko Carstens Date: Wed Mar 5 12:37:09 2008 +0100 [S390] Get rid of memcpy gcc warning workaround. Compile smp.o with -Wno-nonnull so gcc stops warning about memcpy being used with a null parameter. Also remove the workaround code and use a char * cast instead of a void * cast to do computations. Cc: Bastian Blank Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 5ccd0e43bb916872022df974d0f39337797d9277 Author: Heiko Carstens Date: Wed Mar 5 12:37:08 2008 +0100 [S390] idle: Fix machine check handling in idle loop. If a machine check handling is pending when the idle loop is entered default_idle will be left with timer ticks and virtual timer disabled. Fix this by "calling" the idle_chain. Also a BUG_ON(!in_interrupt) in start_hz_timer must be removed since the function now gets called from non interrupt context as well. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 9361a492cded45af2c3e7f50dbec9dd6dab49861 Author: Martin Schwidefsky Date: Wed Mar 5 12:37:07 2008 +0100 [S390] Update default configuration. Signed-off-by: Martin Schwidefsky commit bc97f19dc8be1f181f33b4368542c72498f3562a Author: Adrian Bunk Date: Wed Mar 5 19:05:54 2008 +0800 [CRYPTO] digest: Include internal.h for prototypes Every file should include the headers containing the externs for its global code (in this case for struct crypto_{init,exit}_digest_ops()). Signed-off-by: Adrian Bunk Signed-off-by: Herbert Xu commit f7f0283776b6fe33f87f6a2ef15b1feb49ef6dac Author: Adrian Bunk Date: Mon Mar 3 20:07:52 2008 +0200 UBI: mtd/ubi/vtbl.c: fix memory leak This patch fixes a memory leak introduced by commit 4ccf8cffa963c7b5bdc6d455ea9417084ee49aa8 and spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Artem Bityutskiy commit 8eee9f100b1cc3d1b0a701a8626c54422af3c987 Author: Harvey Harrison Date: Fri Feb 15 10:47:51 2008 +0200 UBI: fix sparse errors in ubi.h In C, signed 1-bit bitfields can only take the values 0 and -1, only 0 and 1 are ever assigned in current code. Make them unsigned bitfields. Fixes the (repeated) sparse errors: drivers/mtd/ubi/ubi.h:220:15: error: dubious one-bit signed bitfield drivers/mtd/ubi/ubi.h:221:17: error: dubious one-bit signed bitfield drivers/mtd/ubi/ubi.h:222:18: error: dubious one-bit signed bitfield drivers/mtd/ubi/ubi.h:223:16: error: dubious one-bit signed bitfield drivers/mtd/ubi/ubi.h:224:20: error: dubious one-bit signed bitfield Signed-off-by: Harvey Harrison Cc: Artem Bityutskiy Signed-off-by: Andrew Morton Signed-off-by: Artem Bityutskiy commit 19cd7b7de1804a50264dfd5c6ba3c6d332362a77 Author: Artem Bityutskiy Date: Tue Feb 12 16:32:35 2008 +0200 UBI: fix error message Make it print "UBI error: cannot attach mtd4" instead of "UBI error: cannot attach 4" Signed-off-by: Artem Bityutskiy commit fc398769ac5cbfdf4dc16a7ba657b284abcc92f5 Author: S.Çağlar Onur Date: Tue Feb 12 13:25:06 2008 +0200 UBI: silence warning drivers/mtd/ubi/vmt.c: In function `ubi_create_volume': drivers/mtd/ubi/vmt.c:379: warning: statement with no effect Signed-off-by: S.Çağlar Onur Signed-off-by: Artem Bityutskiy commit 11b0be7c2c2c142acf73f4efd136a0de7a90ecab Author: Mike Frysinger Date: Mon Mar 3 17:44:14 2008 -0700 [Blackfin] arch: fix atomic and32/xor32 comments and ENDPROC markings Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 3d7e6cf8f5837c6dace759734c987e03021a4015 Author: Michael Hennerich Date: Mon Mar 3 17:40:28 2008 -0700 [Blackfin] arch: fix bug - allow SDH driver to be used as module Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 2f775dbaa541d6bc0cccf20aab95f7a0930ef7e9 Author: Bryan Wu Date: Thu Mar 6 16:04:58 2008 -0700 [Blackfin] arch: to kill syscalls missing warning by adding new timerfd syscalls Signed-off-by: Bryan Wu commit 21f1e91d4bb8fa7cd3a59938471fc7c7d27f82da Author: FUJITA Tomonori Date: Sat Mar 1 15:36:37 2008 +0900 [SCSI] tgt: fix build errors when dprintk is defined drivers/scsi/ibmvscsi/ibmvstgt.c: In function 'ibmvstgt_cmd_done': drivers/scsi/ibmvscsi/ibmvstgt.c:292: error: 'cmd' undeclared (first use in this function) drivers/scsi/ibmvscsi/ibmvstgt.c:292: error: (Each undeclared identifier is reported only once drivers/scsi/ibmvscsi/ibmvstgt.c:292: error: for each function it appears in.) Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley commit cccddc2d15c32bdb6972aaf98f4c9e3e807833df Author: FUJITA Tomonori Date: Sat Mar 1 15:36:36 2008 +0900 [SCSI] tgt: set the data length properly scsi_tgt uses REQ_TYPE_BLOCK_PC so scsi_init_io doesn't set the length for us. scsi_tgt needs to do it by itself. Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley commit 36802e99894e9757de2441b4f719c05a29495dc5 Author: FUJITA Tomonori Date: Sat Mar 1 15:36:35 2008 +0900 [SCSI] tgt: stop zero'ing scsi_cmnd The scsi midlayer allocates scsi_cmnd->sense_buffer dynamically so we can't initialize scsi_cmnd (the midlyaer does for us). Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley commit b560665ce5a617aff9c62b94a82340fe11fc0d91 Author: FUJITA Tomonori Date: Sat Mar 1 15:36:34 2008 +0900 [SCSI] ibmvstgt: set up scsi_host properly before __scsi_alloc_queue Before calling __scsi_alloc_queue, scsi_host->shost_gendev.parent must be initialized properly. This patch moves __scsi_alloc_queue after scsi_add_host (like initiator drivers do). Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley commit ab3b0be84c3877dd0cccef38693254b83782bb70 Author: Randy Dunlap Date: Fri Feb 29 22:03:27 2008 -0800 [SCSI] docbook: fix fusion source files Fix docbook problems in fusion source files. These cause the generated docbook to be incorrect. Signed-off-by: Randy Dunlap Acked-by: Eric Moore Signed-off-by: James Bottomley commit 79f5bb2839c41a007d7ce1a35f58ea14cef6fdb4 Author: Randy Dunlap Date: Fri Feb 29 22:02:50 2008 -0800 [SCSI] docbook: fix scsi source file Fix docbook problem in SCSI source files. These cause the generated docbook to be incorrect. Signed-off-by: Randy Dunlap Signed-off-by: James Bottomley commit ca3aefb8227aee7ede49a71c26adf8538b889724 Author: Andrew Vasquez Date: Thu Feb 28 14:06:12 2008 -0800 [SCSI] qla2xxx: Update version number to 8.02.00-k9. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 00a537b8204c7360852379b4d56adbeedecc9bb9 Author: Andrew Vasquez Date: Thu Feb 28 14:06:11 2008 -0800 [SCSI] qla2xxx: Correct usage of inconsistent timeout values while issuing ELS commands. The original code would incorrectly hardcode ELS timeout values rather than using the traditional '2 * r_a_tov' value. In some cases, the hardcoded values would be larger than the mailbox-command-timeout and result in a needless BIG_HAMMER (ISP reset), the typical recovery mechanism employed in such cases. The second defect in the original code was in the assignment of the default 'ha->r_a_tov' to twice the traditional value. Correct this by setting the value to 10 seconds. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 3e8ce320cfc6cc10a7b99d8d6508d00bde20fdb7 Author: Andrew Vasquez Date: Thu Feb 28 14:06:10 2008 -0800 [SCSI] qla2xxx: Correct discrepancies during OVERRUN handling on FWI2-capable cards. For recent ISPs, software must detect OVERRUN conditions by checking the SS_RESIDUAL_OVER bit during CS_COMPLETE handling. Update the driver to perform this check, which is consistent with what earlier firmwares did by explicitly cracking open the FCP_RSP statuses and returning an CS_DATA_OVERRUN. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 7c7f1f299b7f21f1f5fd4fa3da6b626406109f30 Author: Andrew Vasquez Date: Thu Feb 28 14:06:09 2008 -0800 [SCSI] qla2xxx: Correct needless clean-up resets during shutdown. There's no point in hitting the RISC with what will most assuredly be an unsucessful reset of the RISC hardware if the initial stop-firmware mailbox command fails with a time-out status. Instead, to avoid what could amount to a lengthy stop-firmware/detect-failure/reset-risc loop, continue with driver unloading and discard the stop-firmware requirement. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit ba1cb4618b2d7becc62c9fd67287e733a23611bc Author: Nick Cheng Date: Wed Feb 27 16:22:03 2008 +0800 [SCSI] arcmsr: update version and changelog The fix up from Daniel Drake for replacing GFP_DMA with something more sensible has gone in here: commit 69e562c234440fb7410877b5b24f4b29ef8521d1 Author: Daniel Drake Date: Wed Feb 20 13:29:05 2008 +0000 [SCSI] arcmsr: fix message allocation add a change log and update the version for this. Signed-off-by: Nick Cheng Signed-off-by: James Bottomley commit 57fd2b6c893ed28ccf1a674699f1ea9d8c556281 Author: FUJITA Tomonori Date: Sun Feb 17 23:46:00 2008 +0900 [SCSI] ps3rom: disable clustering ps3rom does: scsi_for_each_sg(cmd, sgpnt, scsi_sg_count(cmd), k) { kaddr = kmap_atomic(sg_page(sgpnt), KM_IRQ0); We cannot do something like that with the clustering enabled (or we can use scsi_kmap_atomic_sg). Signed-off-by: FUJITA Tomonori Cc: Geert Uytterhoeven Signed-off-by: James Bottomley commit 67768f675ffa587d6081ed1d259e796823023926 Author: FUJITA Tomonori Date: Mon Feb 25 14:23:45 2008 +0100 [SCSI] ps3rom: fix wrong resid calculation bug sg driver rounds up the length in struct scatterlist to be a multiple of 512 in some conditions. So LLDs can't use the data length in a sg list to calculate residual. Instead, the length in struct scsi_cmnd should be used. [Geert: the variable buflen already contains scsi_bufflen(cmd)] Signed-off-by: FUJITA Tomonori Signed-off-by: Geert Uytterhoeven Signed-off-by: James Bottomley commit 00da714b31b944400ee789e477f58247cff30b1b Author: Ke Wei Date: Wed Feb 27 20:50:25 2008 +0800 [SCSI] mvsas: fix phy sas address The phy sas address is showing wrongly (wrong endianness). Fix up the endian transforms to make this correct. Signed-off-by: Ke Wei Signed-off-by: James Bottomley commit ee54cc6af95a7fa09da298493b853a9e64fa8abd Author: Boaz Harrosh Date: Wed Feb 27 15:29:15 2008 -0800 [SCSI] gdth: fix to internal commands execution The recent patch named: [SCSI] gdth: !use_sg cleanup and use of scsi accessors has done a bad job in handling internal commands issued by gdth_execute(). Internal commands are issued with device gdth_cmd_str ready made directly to the card, without any mapping or translations of scsi commands. So here I added a gdth_cmd_str pointer to the gdth_cmndinfo private structure which is then copied directly to host. following this patch is a cleanup that removes the home cooked accessors and reverts them to regular scsi_cmnd accessors. Since they are not used anymore. After review maybe the 2 patches should be squashed together. FIXME: There is still a problem with gdth_get_info(). as reported there is a WARN_ON trigerd in dma_free_coherent() when doing: $ cat /proc/sys/gdth/0 Signed-off-by: Boaz Harrosh Tested-by: Joerg Dorchain: Tested-by: Stefan Priebe Tested-by: Jon Chelton Cc: Stable Tree Signed-off-by: James Bottomley commit b31ddd31c266c2ad1b708cad0d3d8e0aa7fa2737 Author: Boaz Harrosh Date: Wed Feb 27 15:27:16 2008 -0800 [SCSI] gdth: bugfix for the at-exit problems gdth_exit would first remove all cards then stop the timer and would not sync with the timer function. This caused a crash in gdth_timer() when module was unloaded. So del_timer_sync the timer before we delete the cards. also the reboot notifier function would crash. So clean that up and fix the crashes. Signed-off-by: Boaz Harrosh Tested-by: Joerg Dorchain: Tested-by: Stefan Priebe Tested-by: Jon Chelton Cc: Stable Tree Signed-off-by: James Bottomley commit 31ed0bf439a15363c28c7a239f52eb127cb6feb3 Author: Mike Christie Date: Tue Feb 26 12:35:23 2008 -0600 [SCSI] iscsi regression: check for zero max session cmds The old tools did not set max session cmds. This is a regression. I removed the check when merging the power of 2 patch. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit e2396f1e4ecd438a15fa653a028b93e95013caa3 Author: James Bottomley Date: Sat Feb 23 23:44:19 2008 -0600 [SCSI] aic94xx: fix TMF ascb handling to prevent sequencer panic This is a particularly nasty bug. The problem is that if any internal ascb times out, currently we free it even though it's pending at the sequencer. This results in the sequencer getting terminally confused and the error message: BUG:sequencer:dl:no ascb Being returned when it comes back. The way to fix this is to manage freeing the ascb from the tasklet completion routine, so that we only free it when the sequencer actually returns it. The code is also altered to use on stack completions and transfer variables. Signed-off-by: James Bottomley commit 8de3ef25a1fcd28d270b69417a41b424826d4f89 Author: James Bottomley Date: Sat Feb 23 23:39:59 2008 -0600 [SCSI] libsas: misc fixes to the eh path - Correct one use after free of the sas task - update the reset required path to move straight to LUN reset - make the bigger hammer actually reset something instead of just trying to clear all the tasks. Signed-off-by: James Bottomley commit a29c05153630b2cd5ea078c97c0abe084cd830d8 Author: James Bottomley Date: Sat Feb 23 23:38:44 2008 -0600 [SCSI] libsas: use the supplied address for SATA devices rather than changing it Once the phy reset is plumbed in properly, SATA error handling fails nastily because we change the port attached_sas_address using the WWN field of the IDENTIFY message. This is a nice thing to do in theory, but it really destroys hotplug because any event on the port causes an automatic mismatch between the sas_address the phy just picked up and the one we propagate into the port. However ugly they are, we have to stick with the sas addresses made up by the phys and expanders. Also does a few cosmetic changes to the way port printing is done to make it clearer how a port is formed. Signed-off-by: James Bottomley commit 63edf49e67cac710826108697c4e8636c89abd17 Author: James Bottomley Date: Sat Feb 23 23:37:26 2008 -0600 [SCSI] aic94xx: plumb in I_T_nexus_reset task management function Currently aic94xx has no exported I_T_nexus_reset function. This is a bit of a huge problem, since sas_ata relies on this function to perform an ATA phy reset and also it means that if abort fails, we really have no bigger hammer to hit everything with. Plumb in the I_T_nexus_reset by quiescing the sequencer, sending the correct phy reset (link for ATA and hard for SAS) and then carefully resuming the sequencer again. Signed-off-by: James Bottomley commit 5319578ca38a8b90b6d0270c194c65d1dd8f7725 Author: James Bottomley Date: Sat Feb 23 23:35:44 2008 -0600 [SCSI] libsas: export sas_find_local_phy function This is needed by the to be added I_T reset function in aic94xx. It needs to know the local phy so it can send a link or hard reset along the path. Signed-off-by: James Bottomley commit eea5ff7bde45c7724594e6a3c9a6290691ddabe9 Author: James Bottomley Date: Sat Feb 23 23:51:00 2008 -0600 [SCSI] mvsas: remove execute permission from file mvsas.c picked up execute permissions. Move it back to being a plane old file. James Bottomley Signed-off-by: James Bottomley commit 3e16bfbaf3195b4725bc87d6a1ef11bf7716e83d Author: Herbert Xu Date: Sat Feb 23 11:13:00 2008 +0800 [CRYPTO] authenc: Add missing Kconfig dependency on BLKCIPHER The authenc algorithm requires BLKCIPHER to be present. Signed-off-by: Herbert Xu commit 76fc60a2e3c6aa6e98cd3a5cb81a1855c637b274 Author: Herbert Xu Date: Sat Feb 23 11:12:06 2008 +0800 [CRYPTO] skcipher: Move chainiv/seqiv into crypto_blkcipher module For compatibility with dm-crypt initramfs setups it is useful to merge chainiv/seqiv into the crypto_blkcipher module. Since they're required by most algorithms anyway this is an acceptable trade-off. Signed-off-by: Herbert Xu