1. 09 May, 2007 3 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 6ec129c3
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (58 commits)
        [SCSI] zfcp: clear boxed flag on unit reopen.
        [SCSI] zfcp: clear adapter failed flag if an fsf request times out.
        [SCSI] zfcp: rework request ID management.
        [SCSI] zfcp: Fix deadlock between zfcp ERP and SCSI
        [SCSI] zfcp: Locking for req_no and req_seq_no
        [SCSI] zfcp: print S_ID and D_ID with 3 bytes
        [SCSI] ipr: Use PCI-E reset API for new ipr adapter
        [SCSI] qla2xxx: Update version number to 8.01.07-k7.
        [SCSI] qla2xxx: Add MSI support.
        [SCSI] qla2xxx: Correct pci_set_msi() usage semantics.
        [SCSI] qla2xxx: Attempt to stop firmware only if it had been previously executed.
        [SCSI] qla2xxx: Honor NVRAM port-down-retry-count settings.
        [SCSI] qla2xxx: Error-out during probe() if we're unable to complete HBA initialization.
        [SCSI] zfcp: Stop system after memory corruption
        [SCSI] mesh: cleanup variable usage in interrupt handler
        [SCSI] megaraid: replace yield() with cond_resched()
        [SCSI] megaraid: fix warnings when CONFIG_PROC_FS=n
        [SCSI] aacraid: correct SUN products to README
        [SCSI] aacraid: superfluous adapter reset for IBM 8 series ServeRAID controllers
        [SCSI] aacraid: kexec fix (reset interrupt handler)
        ...
      6ec129c3
    • Linus Torvalds's avatar
      Revert "fbdev: ignore VESA modes if framebuffer is disabled" · 01e73be3
      Linus Torvalds authored
      This reverts commit 464bdd33.
      
      Peter Anvin correctly points out that VESA modes have nothing to do with
      frame buffers per se - they are often just regular extended text modes.
      Disabling them just because we don't have frame buffer support is very
      wrong.
      
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Antonino A. Daplas <adaplas@gmail.com>,
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      01e73be3
    • Linus Torvalds's avatar
      Remove suid/sgid bits on [f]truncate() · 7b82dc0e
      Linus Torvalds authored
      .. to match what we do on write().  This way, people who write to files
      by using [f]truncate + writable mmap have the same semantics as if they
      were using the write() family of system calls.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7b82dc0e
  2. 08 May, 2007 37 commits