1. 25 Jul, 2015 6 commits
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.2-rc2-fix3' of... · 763e326c
      Linus Torvalds authored
      Merge tag 'trace-v4.2-rc2-fix3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull ftrace fix from Steven Rostedt:
       "Back in 3.16 the ftrace code was redesigned and cleaned up to remove
        the double iteration list (one for registered ftrace ops, and one for
        registered "global" ops), to just use one list.  That simplified the
        code but also broke the function tracing filtering on pid.
      
        This updates the code to handle the filtering again with the new
        logic"
      
      * tag 'trace-v4.2-rc2-fix3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftrace: Fix breakage of set_ftrace_pid
      763e326c
    • Linus Torvalds's avatar
      Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm · 45200838
      Linus Torvalds authored
      Pull libnvdimm fix from Dan Williams:
       "A minor fix for the libnvdimm subsystem.
      
        This is not critical.  The problem can be worked around in userspace
        by putting the namespace temporarily into raw mode
        (ndctl_namespace_set_raw_mode() from libndctl), but that is awkward
        for management utilities.
      
      * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm:
        libnvdimm: fix namespace seed creation
      45200838
    • Linus Torvalds's avatar
      Merge tag 'md/4.2-fixes' of git://neil.brown.name/md · aca105a6
      Linus Torvalds authored
      Pull md fixes from Neil Brown:
       "Some md fixes for 4.2
      
        Several are tagged for -stable.
        A few aren't because they are not very, serious or because they are in
        the 'experimental' cluster code"
      
      * tag 'md/4.2-fixes' of git://neil.brown.name/md:
        md/raid5: clear R5_NeedReplace when no longer needed.
        Fix read-balancing during node failure
        md-cluster: fix bitmap sub-offset in bitmap_read_sb
        md: Return error if request_module fails and returns positive value
        md: Skip cluster setup in case of error while reading bitmap
        md/raid1: fix test for 'was read error from last working device'.
        md: Skip cluster setup for dm-raid
        md: flush ->event_work before stopping array.
        md/raid10: always set reshape_safe when initializing reshape_position.
        md/raid5: avoid races when changing cache size.
      aca105a6
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd · 32fd3d4a
      Linus Torvalds authored
      Pull MTD fixes from Brian Norris:
       "Two trivial updates.  I meant to send these much earlier, but I've
        been preoccupied.
      
         - Add MAINTAINERS entry for diskonchip g3 driver
      
         - Fix an overlooked conflict in bitfield value assignments
      
        The latter update is a bit overdue, but there's no reason to wait any
        longer"
      
      * tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd:
        mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
        MAINTAINERS: mtd: docg3: add docg3 maintainer
      32fd3d4a
    • Dan Williams's avatar
      libnvdimm: fix namespace seed creation · 8ca24353
      Dan Williams authored
      A new BLK namespace "seed" device is created whenever the current seed
      is successfully probed.  However, if that namespace is assigned to a BTT
      it may never directly experience a successful probe as it is a
      subordinate device to a BTT configuration.
      
      The effect of the current code is that no new namespaces can be
      instantiated, after the seed namespace, to consume available BLK DPA
      capacity.  Fix this by treating a successful BTT probe event as a
      successful probe event for the backing namespace.
      Reported-by: default avatarNicholas Moulin <nicholas.w.moulin@linux.intel.com>
      Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
      8ca24353
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 33b40178
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "Four smaller fixes for the current series.  This contains:
      
         - A fix for clones of discard bio's, that can cause data corruption.
           From Martin.
      
         - A fix for null_blk, where in certain queue modes it could access a
           request after it had been freed.  From Mike Krinkin.
      
         - An error handling leak fix for blkcg, from Tejun.
      
         - Also from Tejun, export of the functions that a file system needs
           to implement cgroup writeback support"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: Do a full clone when splitting discard bios
        block: export bio_associate_*() and wbc_account_io()
        blkcg: fix gendisk reference leak in blkg_conf_prep()
        null_blk: fix use-after-free problem
      33b40178
  2. 24 Jul, 2015 34 commits