1. 23 Oct, 2010 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 91b74501
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: remove in_workqueue_context()
        workqueue: Clarify that schedule_on_each_cpu is synchronous
        memory_hotplug: drop spurious calls to flush_scheduled_work()
        shpchp: update workqueue usage
        pciehp: update workqueue usage
        isdn/eicon: don't call flush_scheduled_work() from diva_os_remove_soft_isr()
        workqueue: add and use WQ_MEM_RECLAIM flag
        workqueue: fix HIGHPRI handling in keep_working()
        workqueue: add queue_work and activate_work trace points
        workqueue: prepare for more tracepoints
        workqueue: implement flush[_delayed]_work_sync()
        workqueue: factor out start_flush_work()
        workqueue: cleanup flush/cancel functions
        workqueue: implement alloc_ordered_workqueue()
      
      Fix up trivial conflict in fs/gfs2/main.c as per Tejun
      91b74501
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.37/misc' of git://git.kernel.dk/linux-2.6-block · 04cc6976
      Linus Torvalds authored
      * 'for-2.6.37/misc' of git://git.kernel.dk/linux-2.6-block:
        pipe: fix failure to return error code on ->confirm()
      04cc6976
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block · a2887097
      Linus Torvalds authored
      * 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block: (46 commits)
        xen-blkfront: disable barrier/flush write support
        Added blk-lib.c and blk-barrier.c was renamed to blk-flush.c
        block: remove BLKDEV_IFL_WAIT
        aic7xxx_old: removed unused 'req' variable
        block: remove the BH_Eopnotsupp flag
        block: remove the BLKDEV_IFL_BARRIER flag
        block: remove the WRITE_BARRIER flag
        swap: do not send discards as barriers
        fat: do not send discards as barriers
        ext4: do not send discards as barriers
        jbd2: replace barriers with explicit flush / FUA usage
        jbd2: Modify ASYNC_COMMIT code to not rely on queue draining on barrier
        jbd: replace barriers with explicit flush / FUA usage
        nilfs2: replace barriers with explicit flush / FUA usage
        reiserfs: replace barriers with explicit flush / FUA usage
        gfs2: replace barriers with explicit flush / FUA usage
        btrfs: replace barriers with explicit flush / FUA usage
        xfs: replace barriers with explicit flush / FUA usage
        block: pass gfp_mask and flags to sb_issue_discard
        dm: convey that all flushes are processed as empty
        ...
      a2887097
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.37/drivers' of git://git.kernel.dk/linux-2.6-block · 8abfc6e7
      Linus Torvalds authored
      * 'for-2.6.37/drivers' of git://git.kernel.dk/linux-2.6-block: (95 commits)
        cciss: fix PCI IDs for new Smart Array controllers
        drbd: add race-breaker to drbd_go_diskless
        drbd: use dynamic_dev_dbg to optionally log uuid changes
        dynamic_debug.h: Fix dynamic_dev_dbg() macro if CONFIG_DYNAMIC_DEBUG not set
        drbd: cleanup: change "<= 0" to "== 0"
        drbd: relax the grace period of the md_sync timer again
        drbd: add some more explicit drbd_md_sync
        drbd: drop wrong debug asserts, fix recently introduced race
        drbd: cleanup useless leftover warn/error printk's
        drbd: add explicit drbd_md_sync to drbd_resync_finished
        drbd: Do not log an ASSERT for P_OV_REQUEST packets while C_CONNECTED
        drbd: fix for possible deadlock on IO error during resync
        drbd: fix unlikely access after free and list corruption
        drbd: fix for spurious fullsync (uuids rotated too fast)
        drbd: allow for explicit resync-finished notifications
        drbd: preparation commit, using full state in receive_state()
        drbd: drbd_send_ack_dp must not rely on header information
        drbd: Fix regression in recv_bm_rle_bits (compressed bitmap)
        drbd: Fixed a stupid copy and paste error
        drbd: Allow larger values for c-fill-target.
        ...
      
      Fix up trivial conflict in drivers/block/ataflop.c due to BKL removal
      8abfc6e7
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block · e9dd2b68
      Linus Torvalds authored
      * 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block: (39 commits)
        cfq-iosched: Fix a gcc 4.5 warning and put some comments
        block: Turn bvec_k{un,}map_irq() into static inline functions
        block: fix accounting bug on cross partition merges
        block: Make the integrity mapped property a bio flag
        block: Fix double free in blk_integrity_unregister
        block: Ensure physical block size is unsigned int
        blkio-throttle: Fix possible multiplication overflow in iops calculations
        blkio-throttle: limit max iops value to UINT_MAX
        blkio-throttle: There is no need to convert jiffies to milli seconds
        blkio-throttle: Fix link failure failure on i386
        blkio: Recalculate the throttled bio dispatch time upon throttle limit change
        blkio: Add root group to td->tg_list
        blkio: deletion of a cgroup was causes oops
        blkio: Do not export throttle files if CONFIG_BLK_DEV_THROTTLING=n
        block: set the bounce_pfn to the actual DMA limit rather than to max memory
        block: revert bad fix for memory hotplug causing bounces
        Fix compile error in blk-exec.c for !CONFIG_DETECT_HUNG_TASK
        block: set the bounce_pfn to the actual DMA limit rather than to max memory
        block: Prevent hang_check firing during long I/O
        cfq: improve fsync performance for small files
        ...
      
      Fix up trivial conflicts due to __rcu sparse annotation in include/linux/genhd.h
      e9dd2b68
  2. 22 Oct, 2010 35 commits