diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-26 02:02:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-26 02:02:59 +0200 |
| commit | 0b31c3ec1b0eac7ca71a7aa4a4a93d02fcade33d (patch) | |
| tree | 4a75bbf743e706ce53f2607d67162011bab49c2c /drivers/mtd/nand/nandsim.c | |
| parent | Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | blk-mq-debugfs: Add names for recently added flags (diff) | |
| download | linux-0b31c3ec1b0eac7ca71a7aa4a4a93d02fcade33d.tar.xz linux-0b31c3ec1b0eac7ca71a7aa4a4a93d02fcade33d.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A small batch of fixes that should be included for the 4.13 release.
This contains:
- Revert of the 4k loop blocksize support. Even with a recent batch
of 4 fixes, we're still not really happy with it. Rather than be
stuck with an API issue, let's revert it and get it right for 4.14.
- Trivial patch from Bart, adding a few flags to the blk-mq debugfs
exports that were added in this release, but not to the debugfs
parts.
- Regression fix for bsg, fixing a potential kernel panic. From
Benjamin.
- Tweak for the blk throttling, improving how we account discards.
From Shaohua"
* 'for-linus' of git://git.kernel.dk/linux-block:
blk-mq-debugfs: Add names for recently added flags
bsg-lib: fix kernel panic resulting from missing allocation of reply-buffer
Revert "loop: support 4k physical blocksize"
blk-throttle: cap discard request size
Diffstat (limited to 'drivers/mtd/nand/nandsim.c')
0 files changed, 0 insertions, 0 deletions