diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-12 11:35:19 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-12 11:35:19 -0700 | 
| commit | b85dfd30cb37318587018ee430c2c1cfabf3dabc (patch) | |
| tree | c4e1f65ff2d266913fd6fe9fc2e10138aac1aac5 /net/lapb/lapb_out.c | |
| parent | 7b565d9d1f9bfa16db5f78e4f547ce4bb1ecbdce (diff) | |
| parent | b6f2098fb708ce935a59763178c4e8cd942fcf88 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fixes from Jens Axboe:
 "Remember about a week ago when I sent the last pull request for 4.1?
  Well, I lied.  Now, I don't want to shift the blame, but Dan, Ming,
  and Richard made a liar out of me.
  Here are three small patches that should go into 4.1.  More
  specifically, this pull request contains:
   - A Kconfig dependency for the pmem block driver, so it can't be
     selected if HAS_IOMEM isn't availble.  From Richard Weinberger.
   - A fix for genhd, making the ext_devt_lock softirq safe.  This makes
     lockdep happier, since we also end up grabbing this lock on release
     off the softirq path.  From Dan Williams.
   - A blk-mq software queue release fix from Ming Lei.
  Last two are headed to stable, first fixes an issue introduced in this
  cycle"
* 'for-linus' of git://git.kernel.dk/linux-block:
  block: pmem: Add dependency on HAS_IOMEM
  block: fix ext_dev_lock lockdep report
  blk-mq: free hctx->ctxs in queue's release handler
Diffstat (limited to 'net/lapb/lapb_out.c')
0 files changed, 0 insertions, 0 deletions
