1. 15 4月, 2009 4 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · 9fc0178c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
        nilfs2: fix possible mismatch of sufile counters on recovery
        nilfs2: segment usage file cleanups
        nilfs2: fix wrong accounting and duplicate brelse in nilfs_sufile_set_error
        nilfs2: simplify handling of active state of segments fix
        nilfs2: remove module version
        nilfs2: fix lockdep recursive locking warning on meta data files
        nilfs2: fix lockdep recursive locking warning on bmap
        nilfs2: return f_fsid for statfs2
      9fc0178c
    • L
      Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze · 2b6b6d38
      Linus Torvalds 提交于
      * 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Add missing FILE tag to MAINTAINERS
        microblaze: remove duplicated #include's
        microblaze: struct device - replace bus_id with dev_name()
        microblaze: Simplify copy_thread()
        microblaze: Add TIMESTAMPING constants to socket.h
        microblaze: Add missing empty ftrace.h file
        microblaze: Fix problem with removing zero length files
      2b6b6d38
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 3e862dd5
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
        sh: Add in PCI bus for DMA API debugging.
        sh: Pre-allocate a reasonable number of DMA debug entries.
        sh: sh7786: modify usb setup timeout judgment bug.
        MAINTAINERS: Update sh architecture file patterns.
        sh: ap325: use edge control for ov772x camera
        sh: Plug in support for ARCH=sh64 using sh SRCARCH.
        sh: urquell: Fix up address mapping in board comments.
        sh: Add support for DMA API debugging.
        sh: Provide cpumask_of_pcibus() to fix NUMA build.
        sh: urquell: Add board comment
        sh: wire up sys_preadv/sys_pwritev() syscalls.
        sh: sh7785lcr: fix PCI address map for 32-bit mode
        sh: intc: Added resume from hibernation support to the intc
      3e862dd5
    • D
      Fix lpfc_parse_bg_err()'s use of do_div() · 2344b5b6
      David Howells 提交于
      Fix lpfc_parse_bg_err()'s use of do_div().  It should be passing a 64-bit
      variable as the first parameter.  However, since it's only using a 32-bit
      variable, it doesn't need to use do_div() at all, but can instead use the
      division operator.
      
      This deals with the following warnings:
      
          CC      drivers/scsi/lpfc/lpfc_scsi.o
        drivers/scsi/lpfc/lpfc_scsi.c: In function 'lpfc_parse_bg_err':
        drivers/scsi/lpfc/lpfc_scsi.c:1397: warning: comparison of distinct pointer types lacks a cast
        drivers/scsi/lpfc/lpfc_scsi.c:1397: warning: right shift count >= width of type
        drivers/scsi/lpfc/lpfc_scsi.c:1397: warning: passing argument 1 of '__div64_32' from incompatible pointer type
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2344b5b6
  2. 14 4月, 2009 36 次提交