1. 18 10月, 2007 4 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block · b6257a90
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
        [SCSI] Remove full sg table memset()
        [SCSI] ide-scsi: remove usage of sg_last()
        Fix loop terminating conditions in fill_sg().
        [BLOCK] Clear sg entry before filling in blk_rq_map_sg()
        IA64: iommu uses sg_next with an invalid sg element
        cciss: disable DMA refetch on Smart Array P600
        swiotlb: fix map_sg failure handling
        SPARC64: fix iommu sg chaining
        [SCSI] ide-scsi: use scsi_sg_count() instead of ->use_sg
      b6257a90
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · c548f08a
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (24 commits)
        [POWERPC] Fix vmemmap warning in init_64.c
        [POWERPC] Fix 64 bits vDSO DWARF info for CR register
        [POWERPC] Add 1TB workaround for PA6T
        [POWERPC] Enable NO_HZ and high res timers for pseries and ppc64 configs
        [POWERPC] Quieten cache information at boot
        [POWERPC] Quieten clockevent printk
        [POWERPC] Enable SLUB in *_defconfig
        [POWERPC] Fix 1TB segment detection
        [POWERPC] Fix iSeries_hpte_insert prototype
        [POWERPC] Fix copyright symbol
        [POWERPC] ibmebus: Move to of_device and of_platform_driver, match eHCA and eHEA drivers
        [POWERPC] ibmebus: Add device creation and bus probing based on of_device
        [POWERPC] ibmebus: Remove bus match/probe/remove functions
        [POWERPC] Move of_device allocation into of_device.[ch]
        [POWERPC] mpc52xx: device tree changes for FEC and MDIO
        [POWERPC] bestcomm: GenBD task support
        [POWERPC] bestcomm: FEC task support
        [POWERPC] bestcomm: ATA task support
        [POWERPC] bestcomm: core bestcomm support for Freescale MPC5200
        [POWERPC] mpc52xx: Update mpc52xx_psc structure with B revision changes
        ...
      c548f08a
    • L
      Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 · 347c53dc
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: (59 commits)
        [XFS] eagerly remove vmap mappings to avoid upsetting Xen
        [XFS] simplify validata_fields
        [XFS] no longer using io_vnode, as was remaining from 23 cherrypick
        [XFS] Remove STATIC which was missing from prior manual merge
        [XFS] Put back the QUEUE_ORDERED_NONE test in the barrier check.
        [XFS] Turn off XBF_ASYNC flag before re-reading superblock.
        [XFS] avoid race in sync_inodes() that can fail to write out all dirty data
        [XFS] This fix prevents bulkstat from spinning in an infinite loop.
        [XFS] simplify xfs_create/mknod/symlink prototype
        [XFS] avoid xfs_getattr in XFS_IOC_FSGETXATTR ioctl
        [XFS] get_bulkall() could return incorrect inode state
        [XFS] Kill unused IOMAP_EOF flag
        [XFS] fix when DMAPI mount option processing happens
        [XFS] ensure file size is logged on synchronous writes
        [XFS] growlock should be a mutex
        [XFS] replace some large xfs_log_priv.h macros by proper functions
        [XFS] kill struct bhv_vfs
        [XFS] move syncing related members from struct bhv_vfs to struct xfs_mount
        [XFS] kill the vfs_flags member in struct bhv_vfs
        [XFS] kill the vfs_fsid and vfs_altfsid members in struct bhv_vfs
        ...
      347c53dc
    • L
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup · 5c8e191e
      Linus Torvalds 提交于
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
        Remove magic macros for screen_info structure members
        [x86] remove uses of magic macros for boot_params access
      5c8e191e
  2. 17 10月, 2007 36 次提交