1. 26 Sep, 2013 38 commits
  2. 25 Sep, 2013 2 commits
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 4b972806
      Linus Torvalds authored
      Pull Xen fixes from Konrad Rzeszutek Wilk:
       "Bug-fixes and one update to the kernel-paramters.txt documentation.
      
         - Fix PV spinlocks triggering jump_label code bug
         - Remove extraneous code in the tpm front driver
         - Fix ballooning out of pages when non-preemptible
         - Fix deadlock when using a 32-bit initial domain with large amount
           of memory
         - Add xen_nopvpsin parameter to the documentation"
      
      * tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/spinlock: Document the xen_nopvspin parameter.
        xen/p2m: check MFN is in range before using the m2p table
        xen/balloon: don't alloc page while non-preemptible
        xen: Do not enable spinlocks before jump_label_init() has executed
        tpm: xen-tpmfront: Remove the locality sysfs attribute
        tpm: xen-tpmfront: Fix default durations
      4b972806
    • Linus Torvalds's avatar
      Merge tag 'dm-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · e93dd910
      Linus Torvalds authored
      Pull device-mapper fixes from Mike Snitzer:
       "A few fixes for dm-snapshot, a 32 bit fix for dm-stats, a couple error
        handling fixes for dm-multipath.  A fix for the thin provisioning
        target to not expose non-zero discard limits if discards are disabled.
      
        Lastly, add two DM module parameters which allow users to tune the
        emergency memory reserves that DM mainatins per device -- this helps
        fix a long-standing issue for dm-multipath.  The conservative default
        reserve for request-based dm-multipath devices (256) has proven
        problematic for users with many multipathed SCSI devices but
        relatively little memory.  To responsibly select a smaller value users
        should use the new nr_bios tracepoint info (via commit 75afb352
        "block: Add nr_bios to block_rq_remap tracepoint") to determine the
        peak number of bios their workloads create"
      
      * tag 'dm-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm: add reserved_bio_based_ios module parameter
        dm: add reserved_rq_based_ios module parameter
        dm: lower bio-based mempool reservation
        dm thin: do not expose non-zero discard limits if discards disabled
        dm mpath: disable WRITE SAME if it fails
        dm-snapshot: fix performance degradation due to small hash size
        dm snapshot: workaround for a false positive lockdep warning
        dm stats: fix possible counter corruption on 32-bit systems
        dm mpath: do not fail path on -ENOSPC
      e93dd910