diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-11 11:17:54 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-11 11:17:54 -0800 |
commit | 69973b830859bc6529a7a0468ba0d80ee5117826 (patch) | |
tree | 5f11fe15ed9d9a3ab9c92242030e54b73ecdce45 /tools/perf/arch/sparc/Makefile | |
parent | 2e4333c14de06a333783d6812cf3c4998f78b0c8 (diff) |
Linux 4.9
Diffstat (limited to 'tools/perf/arch/sparc/Makefile')
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fix from Jens Axboe:
"A single fix that should go into 4.10, fixing a regression on some
devices with the WRITE_SAME command"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: don't try Write Same from __blkdev_issue_zeroout
Diffstat (limited to 'include/target/iscsi/iscsi_target_stat.h')