diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-08 09:56:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-08 09:56:15 -0800 |
| commit | 23fbe2cdc1de80120cf9ccd478ac57c3a3a0764b (patch) | |
| tree | 4aff32d5f2f6fe2f54028bfd4d1b66fdd2f8d281 /net/caif/caif_socket.c | |
| parent | 926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff) | |
| parent | eeeefd41843218c55a8782a6920f044d9bf6207a (diff) | |
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 'net/caif/caif_socket.c')