diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-24 01:00:52 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-24 01:00:52 +0100 |
| commit | b3e27d5d4a29bcc8e057b496d5ef5194addaaac0 (patch) | |
| tree | 504c418833b02a8e7d5fb798fe7bdcee82d7f14c /drivers/scsi/osd | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | NTB: Fix macro parameter conflict with field name (diff) | |
| download | linux-b3e27d5d4a29bcc8e057b496d5ef5194addaaac0.tar.xz linux-b3e27d5d4a29bcc8e057b496d5ef5194addaaac0.zip | |
Merge tag 'ntb-4.5' of git://github.com/jonmason/ntb
Pull NTB updates from Jon Mason:
"A new driver to support AMD NTB, a NTB performance test driver, NTB
bugs fixes, and the ability to recover from running out of DMA
descriptors"
* tag 'ntb-4.5' of git://github.com/jonmason/ntb:
NTB: Fix macro parameter conflict with field name
NTB: Add support for AMD PCI-Express Non-Transparent Bridge
ntb: ntb perf tool
NTB: Address out of DMA descriptor issue with NTB
NTB: Clear property bits in BAR value
NTB: ntb_process_tx error path bug
Diffstat (limited to 'drivers/scsi/osd')
0 files changed, 0 insertions, 0 deletions