Merge branch 'nvme-5.6-rc6' of git://git.infradead.org/nvme into block-5.6

Browse source

Pull NVMe fixes from Keith:

"Two late nvme fabrics fixes for 5.6: a double free with the rdma
 transport, and a regression fix for tcp; please pull."

* 'nvme-5.6-rc6' of git://git.infradead.org/nvme:
  nvmet-tcp: set MSG_MORE only if we actually have more to send
  nvme-rdma: Avoid double freeing of async event data

...

This commit is contained in:

Jens Axboe 2020-03-20 19:14:16 -06:00

parent b53df2e744 98fd5c7237

commit 83166ac82b

2 changed files with 14 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

drivers/nvme/host/rdma.c

View file

12

drivers/nvme/target/tcp.c

View file