]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'nvmf-4.8-rc' of git://git.infradead.org/nvme-fabrics into for-linus
authorJens Axboe <axboe@fb.com>
Tue, 13 Sep 2016 13:58:34 +0000 (07:58 -0600)
committerJens Axboe <axboe@fb.com>
Tue, 13 Sep 2016 13:58:34 +0000 (07:58 -0600)
Sagi writes:

Here we have:
- Kconfig dependencies fix from Arnd
- nvme-rdma device removal fixes from Steve
- possible bad deref fix from Colin

1  2 
drivers/infiniband/hw/cxgb4/cm.c
drivers/infiniband/hw/cxgb4/device.c
drivers/infiniband/hw/cxgb4/iw_cxgb4.h

Simple merge
Simple merge