aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/include/linux/blk_types.h
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2017-11-03 10:28:51 -0600
committerJens Axboe <axboe@kernel.dk>2017-11-03 10:28:51 -0600
commit3e2cb3ad47500ed12d4c8b4cbd737dca352e38e4 (patch)
tree613bdf98252519e5a538c386d1a3054aaaade4de /include/linux/blk_types.h
parentskd: use ktime_get_real_seconds() (diff)
parentnvme: comment typo fixed in clearing AER (diff)
downloadwireguard-linux-3e2cb3ad47500ed12d4c8b4cbd737dca352e38e4.tar.xz
wireguard-linux-3e2cb3ad47500ed12d4c8b4cbd737dca352e38e4.zip
Merge branch 'nvme-4.15' of git://git.infradead.org/nvme into for-4.15/block
Pull NVMe changes from Christoph: "Below are the currently queue nvme updates for Linux 4.15. There are a few more things that could make it for this merge window, but I'd like to get things into linux-next, especially for the unlikely case that Linus decided to cut -rc8. Highlights: - support for SGLs in the PCIe driver (Chaitanya Kulkarni) - disable I/O schedulers for the admin queue (Israel Rukshin) - various Fibre Channel fixes and enhancements (James Smart) - various refactoring for better code sharing between transports (Sagi Grimberg and me) as well as lots of little bits from various contributors."
Diffstat (limited to 'include/linux/blk_types.h')
0 files changed, 0 insertions, 0 deletions