/include/uapi/asm-generic/

git/diff/net/sctp/input.c?h=nds-private-remove&id=23fbe2cdc1de80120cf9ccd478ac57c3a3a0764b&id2=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/sctp/input.c')