diff options
| author | Jens Axboe <axboe@kernel.dk> | 2017-07-10 20:44:34 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-07-10 20:44:34 +0300 |
| commit | 459bd0dc3935d5bb04a7bc92c1a6b1a24897e0f7 (patch) | |
| tree | b088bfb261fd6f18719dfa3f8af4b3dca197b2d4 /drivers/iommu/intel-iommu.c | |
| parent | 56c76417ad310a060252a13f88001c35b73d241d (diff) | |
| parent | c2f30f08c115a6bb9061afb4ba314f7e41f20686 (diff) | |
| download | linux-459bd0dc3935d5bb04a7bc92c1a6b1a24897e0f7.tar.xz | |
Merge branch 'nvme-4.13' of git://git.infradead.org/nvme into for-linus
Pull followup NVMe (mostly) changes from Sagi:
I added the quiesce/unquiesce patches in here as it's
easy for me easily apply changes on top. It has accumulated
reviews and includes mostly nvme anyway, please tell me if
you don't want to take them with this.
This includes:
- quiesce/unquiesce fixes in nvme and others from me
- nvme-fc add create association padding spec updates from James
- some more quirking from MKP
- nvmet nit cleanup from Max
- Fix nvme-rdma racy RDMA completion signalling from Marta
- some centralization patches from me
- add tagset nr_hw_queues updates on controller resets in
nvme drivers from me
- nvme-rdma fix resources recycling when doing error recovery from me
- minor cleanups in nvme-fc from me
Diffstat (limited to 'drivers/iommu/intel-iommu.c')
0 files changed, 0 insertions, 0 deletions