1. 27 7月, 2012 34 次提交
  2. 25 7月, 2012 6 次提交
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · bdc0077a
      Linus Torvalds 提交于
      Pull first round of SCSI updates from James Bottomley:
       "The most important feature of this patch set is the new async
        infrastructure that makes sure async_synchronize_full() synchronizes
        all domains and allows us to remove all the hacks (like having
        scsi_complete_async_scans() in the device base code) and means that
        the async infrastructure will "just work" in future.
      
        The rest is assorted driver updates (aacraid, bnx2fc, virto-scsi,
        megaraid, bfa, lpfc, qla2xxx, qla4xxx) plus a lot of infrastructure
        work in sas and FC.
      
        Signed-off-by: James Bottomley <JBottomley@Parallels.com>"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (97 commits)
        [SCSI] Revert "[SCSI] fix async probe regression"
        [SCSI] cleanup usages of scsi_complete_async_scans
        [SCSI] queue async scan work to an async_schedule domain
        [SCSI] async: make async_synchronize_full() flush all work regardless of domain
        [SCSI] async: introduce 'async_domain' type
        [SCSI] bfa: Fix to set correct return error codes and misc cleanup.
        [SCSI] aacraid: Series 7 Async. (performance) mode support
        [SCSI] aha152x: Allow use on 64bit systems
        [SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
        [SCSI] bfa: squelch lockdep complaint with a spin_lock_init
        [SCSI] qla2xxx: remove unnecessary reads of PCI_CAP_ID_EXP
        [SCSI] qla4xxx: remove unnecessary read of PCI_CAP_ID_EXP
        [SCSI] ufs: fix incorrect return value about SUCCESS and FAILED
        [SCSI] ufs: reverse the ufshcd_is_device_present logic
        [SCSI] ufs: use module_pci_driver
        [SCSI] usb-storage: update usb devices for write cache quirk in quirk list.
        [SCSI] usb-storage: add support for write cache quirk
        [SCSI] set to WCE if usb cache quirk is present.
        [SCSI] virtio-scsi: hotplug support for virtio-scsi
        [SCSI] virtio-scsi: split scatterlist per target
        ...
      bdc0077a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw · 801b0365
      Linus Torvalds 提交于
      Pull GFS2 updates from Steven Whitehouse.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
        GFS2: Eliminate 64-bit divides
        GFS2: Reduce file fragmentation
        GFS2: kernel panic with small gfs2 filesystems - 1 RG
        GFS2: Fixing double brelse'ing bh allocated in gfs2_meta_read when EIO occurs
        GFS2: Combine functions get_local_rgrp and gfs2_inplace_reserve
        GFS2: Add kobject release method
        GFS2: Size seq_file buffer more carefully
        GFS2: Use seq_vprintf for glocks debugfs file
        seq_file: Add seq_vprintf function and export it
        GFS2: Use lvbs for storing rgrp information with mount option
        GFS2: Cache last hash bucket for glock seq_files
        GFS2: Increase buffer size for glocks and glstats debugfs files
        GFS2: Fix error handling when reading an invalid block from the journal
        GFS2: Add "top dir" flag support
        GFS2: Fold quota data into the reservations struct
        GFS2: Extend the life of the reservations
      801b0365
    • L
      Merge branch 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 614a6d43
      Linus Torvalds 提交于
      Pull cgroup changes from Tejun Heo:
       "Nothing too interesting.  A minor bug fix and some cleanups."
      
      * 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: Update remount documentation
        cgroup: cgroup_rm_files() was calling simple_unlink() with the wrong inode
        cgroup: Remove populate() documentation
        cgroup: remove hierarchy_mutex
      614a6d43
    • L
      Merge branch 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · a08489c5
      Linus Torvalds 提交于
      Pull workqueue changes from Tejun Heo:
       "There are three major changes.
      
         - WQ_HIGHPRI has been reimplemented so that high priority work items
           are served by worker threads with -20 nice value from dedicated
           highpri worker pools.
      
         - CPU hotplug support has been reimplemented such that idle workers
           are kept across CPU hotplug events.  This makes CPU hotplug cheaper
           (for PM) and makes the code simpler.
      
         - flush_kthread_work() has been reimplemented so that a work item can
           be freed while executing.  This removes an annoying behavior
           difference between kthread_worker and workqueue."
      
      * 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: fix spurious CPU locality WARN from process_one_work()
        kthread_worker: reimplement flush_kthread_work() to allow freeing the work item being executed
        kthread_worker: reorganize to prepare for flush_kthread_work() reimplementation
        workqueue: simplify CPU hotplug code
        workqueue: remove CPU offline trustee
        workqueue: don't butcher idle workers on an offline CPU
        workqueue: reimplement CPU online rebinding to handle idle workers
        workqueue: drop @bind from create_worker()
        workqueue: use mutex for global_cwq manager exclusion
        workqueue: ROGUE workers are UNBOUND workers
        workqueue: drop CPU_DYING notifier operation
        workqueue: perform cpu down operations from low priority cpu_notifier()
        workqueue: reimplement WQ_HIGHPRI using a separate worker_pool
        workqueue: introduce NR_WORKER_POOLS and for_each_worker_pool()
        workqueue: separate out worker_pool flags
        workqueue: use @pool instead of @gcwq or @cpu where applicable
        workqueue: factor out worker_pool from global_cwq
        workqueue: don't use WQ_HIGHPRI for unbound workqueues
      a08489c5
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 08d9329c
      Linus Torvalds 提交于
      Pull misc udf, ext2, ext3, and isofs fixes from Jan Kara:
       "Assorted, mostly trivial, fixes for udf, ext2, ext3, and isofs.  I'm
        on vacation and scarcely checking email since we are expecting baby
        any day now but these fixes should be safe to go in and I don't want
        to delay them unnecessarily."
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        udf: avoid info leak on export
        isofs: avoid info leak on export
        udf: Improve table length check to avoid possible overflow
        ext3: Check return value of blkdev_issue_flush()
        jbd: Check return value of blkdev_issue_flush()
        udf: Do not decrement i_blocks when freeing indirect extent block
        udf: Fix memory leak when mounting
        ext2: cleanup the confused goto label
        UDF: Remove unnecessary variable "offset" from udf_fill_inode
        udf: stop using s_dirt
        ext3: force ro mount if ext3_setup_super() fails
        quota: fix checkpatch.pl warning by replacing <asm/uaccess.h> with <linux/uaccess.h>
      08d9329c
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 2c05b2c8
      Linus Torvalds 提交于
      Pull m68knommu arch update from Greg Ungerer:
       "Quite a varied set of changes this time.
         - A little more merge cleanup, this time the assembler entry code.
         - New sub-architecture support for the ColdFire 5251/5253 and 5441x
           CPU families.
         - Specific clk support code for the ColdFire 520x and 532x CPU
           familes.
         - Refactoring of the ColdFire GPIO support.
         - PCI bus support for some ColdFire CPUS that have PCI hardware (54xx
           family).  This showed up a few problems with ColdFire cache,
           allocating coherent memory and bi-directional DMA support.  Fixes
           for those too."
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (21 commits)
        m68k: allow PCI bus to be enabled for ColdFire m54xx CPUs
        m68k: add PCI bus code support for the ColdFire M54xx SoC family
        m68k: add IO access definitions to support PCI on ColdFire platforms
        m68k: add PCI bus support definitions for the ColdFire M54xx SoC family
        m68k: common PCI support definitions and code
        m68k: add support for DMA_BIDIRECTIONAL in dma support functions
        m68k: fix ColdFire clear cache operation
        m68k: use simpler dma_alloc_coherent() for ColdFire CPUs
        m68knommu: platform support for 8390 based ethernet used on some boards
        m68knommu: Add clk definitions for m532x.
        m68knommu: Add clk definitions for m520x.
        m68knommu: Add rtc device for m5441x.
        m68knommu: add definitions for the third interrupt controller on devices that don't have a third interrupt controller.
        m68knommu: Add support for the Coldfire m5441x.
        m68knommu: use MCF_IRQ_PIT1 instead of MCFINT_VECBASE + MCFINT_PIT1
        coldfire-qspi: Add support for the Coldfire 5251/5253.
        m68knommu: Add support for the Coldfire 5251/5253
        m68knommu: refactor Coldfire GPIO not to require GPIOLIB, eliminate mcf_gpio_chips.
        m68k: merge the MMU and non-MMU versions of the entry.S code
        m68k: use jbsr to call functions instead of bsrl
        ...
      2c05b2c8