1. 04 11月, 2007 3 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 · 5c27d0f1
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (24 commits)
        sh: Update r7785rp defconfig.
        sh: mach-type updates.
        sh: Fix up r7780rp highlander CF access size.
        sh: Terminate .eh_frame in VDSO with a 4-byte 0.
        sh: Correct SUBARCH matching.
        sh: Decouple 4k and soft/hardirq stacks.
        sh: Fix optimized __copy_user() movca.l usage.
        sh: Clean up SR.RB Kconfig mess.
        sh: Kill off dead ipr_irq_demux().
        sh: Make SH7750 oprofile compile again.
        sh: Provide a __read_mostly section wrapper.
        sh: linker script tidying.
        sh: Move zero page param defs somewhere sensible.
        sh: Use generic SMP_CACHE_BYTES/L1_CACHE_ALIGN.
        sh: Kill off legacy embedded ramdisk section.
        sh: Fix up early mem cmdline parsing.
        sh: Enable USBF on MS7722SE.
        sh: Add resource of USBF for SH7722.
        maple: Fix maple bus compiler warning
        sh: fix zImage build with >=binutils-2.18
        ...
      5c27d0f1
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 468f8afd
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (23 commits)
        libata: don't configure downstream links faster than the upstream link
        libata: request PHY speed configuration on SControl access failure
        libata: consider errors not associated with commands for speed down
        libata: more robust reset failure handling
        libata: cosmetic clean up / reorganization of ata_eh_reset()
        libata: fix timing computation in ata_eh_reset()
        libata: increase 128 KB / cmd limit for ATAPI tape drives
        sata_promise: fix endianess bug in ASIC PRD bug workaround
        libata: fix docbook
        make ata_scsi_lpm_get() static
        libata: suppress two warnings
        ata/sata_fsl: Remove ata_scsi_suspend/resume callbacks
        ata/sata_fsl: Remove sending LOG EXT command in sata_fsl_softreset()
        ata/sata_fsl: Move MPC8315DS link speed limit workaround to specific ifdef
        ata/sata_fsl: cleanup style problem
        ata/sata_fsl: remove unneeded sata_fsl_hardreset()
        ata/sata_fsl: remove unneeded on-stack copy of FIS
        ata/sata_fsl: cleanup needless casts to/from void __iomem *
        ata/sata_fsl: Remove unnecessary SCR cases
        ata/sata_fsl: Kill ata_sg_is_last()
        ...
      468f8afd
    • A
      NTFS: Fix read regression. · ebab8990
      Anton Altaparmakov 提交于
      The regression was caused by:
              commit[a32ea1e1] Fix read/truncate race
      
      This causes ntfs_readpage() to be called for a zero i_size inode, which
      failed when the file was compressed and non-resident.
      
      Thanks a lot to Mike Galbraith for reporting the issue and tracking down
      the commit that caused the regression.
      
      Looking into it I found three bugs which the patch fixes.
      Signed-off-by: NAnton Altaparmakov <aia21@cantab.net>
      Tested-by: NMike Galbraith <efault@gmx.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ebab8990
  2. 03 11月, 2007 37 次提交