diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-21 20:08:26 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-21 20:08:26 +0100 |
commit | b74b991fb8b9d642b8fea20d6245c6e19125a305 (patch) | |
tree | e64b80b2b9a3c37a0e5299aa48e687f2e08a1c92 /drivers/pps | |
parent | Merge tag 'io_uring-5.6-20200320' of git://git.kernel.dk/linux-block (diff) | |
parent | Merge branch 'nvme-5.6-rc6' of git://git.infradead.org/nvme into block-5.6 (diff) | |
download | linux-b74b991fb8b9d642b8fea20d6245c6e19125a305.tar.xz linux-b74b991fb8b9d642b8fea20d6245c6e19125a305.zip |
Merge tag 'block-5.6-20200320' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Just two NVMe fabrics fixes that should go into 5.6"
* tag 'block-5.6-20200320' of git://git.kernel.dk/linux-block:
nvmet-tcp: set MSG_MORE only if we actually have more to send
nvme-rdma: Avoid double freeing of async event data
Diffstat (limited to 'drivers/pps')
0 files changed, 0 insertions, 0 deletions