diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-22 19:23:39 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-22 19:23:39 +0100 |
commit | af22941ae126b528a80c7e1149fa22b31815c826 (patch) | |
tree | bd364ac0648fa6acde2756dfa52f6d875ce0ba1a /drivers/base/cpu.c | |
parent | Merge tag 'acpi-extra-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | block: check partition alignment (diff) | |
download | linux-af22941ae126b528a80c7e1149fa22b31815c826.tar.xz linux-af22941ae126b528a80c7e1149fa22b31815c826.zip |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fixes from Jens Axboe:
"Just a set of small fixes that have either been queued up after the
original pull for this merge window, or just missed the original pull
request.
- a few bcache fixes/changes from Eric and Kent
- add WRITE_SAME to the command filter whitelist frm Mauricio
- kill an unused struct member from Ritesh
- partition IO alignment fix from Stefan
- nvme sysfs printf fix from Stephen"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: check partition alignment
nvme : Use correct scnprintf in cmb show
block: allow WRITE_SAME commands with the SG_IO ioctl
block: Remove unused member (busy) from struct blk_queue_tag
bcache: partition support: add 16 minors per bcacheN device
bcache: Make gc wakeup sane, remove set_task_state()
Diffstat (limited to 'drivers/base/cpu.c')
0 files changed, 0 insertions, 0 deletions