diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-21 19:54:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-21 19:54:01 +0200 |
| commit | ecd06f28836f9d10c92a4740b5aaf7caf4324927 (patch) | |
| tree | 8ceb01018cb6701836bc127ca2a8ebe1c9b3ee57 /include/media/videobuf-dma-sg.h | |
| parent | Merge tag 'pci-v4.9-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | nvmet: use symbolic constants for CNS values (diff) | |
| download | linux-ecd06f28836f9d10c92a4740b5aaf7caf4324927.tar.xz linux-ecd06f28836f9d10c92a4740b5aaf7caf4324927.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A set of fixes that missed the merge window, mostly due to me being
away around that time.
Nothing major here, a mix of nvme cleanups and fixes, and one fix for
the badblocks handling"
* 'for-linus' of git://git.kernel.dk/linux-block:
nvmet: use symbolic constants for CNS values
nvme: use symbolic constants for CNS values
nvme.h: add an enum for cns values
nvme.h: don't use uuid_be
nvme.h: resync with nvme-cli
nvme: Add tertiary number to NVME_VS
nvme : Add sysfs entry for NVMe CMBs when appropriate
nvme: don't schedule multiple resets
nvme: Delete created IO queues on reset
nvme: Stop probing a removed device
badblocks: fix overlapping check for clearing
Diffstat (limited to 'include/media/videobuf-dma-sg.h')
0 files changed, 0 insertions, 0 deletions