summaryrefslogtreecommitdiff
path: root/include/uapi/scsi/fc/fc_gs.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/uapi/scsi/fc/fc_gs.h')
0 files changed, 0 insertions, 0 deletions
c55300e3b8c4a02dfc6 (diff)
Merge branch 'nvme-4.10-fixes' of git://git.infradead.org/nvme into for-linus
Pull nvme target fixes from Sagi: Given that its -rc6, I removed anything that is not bug fix. - nvmet-fc discard fix from Christoph - queue disconnect fix from James - nvmet-rdma dma sync fix from Parav - Some more nvmet fixes
Diffstat (limited to 'include/acpi/acpixf.h')