diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-31 10:48:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-31 10:48:09 -0800 |
| commit | 29a9b0008d5ddbea8a6dcfd5aecc866585f6048e (patch) | |
| tree | 84a6380629804eacf37f3d470c2ab6d2f62d5dfd /drivers/base | |
| parent | Merge tag 'tty-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty (diff) | |
| parent | staging: android: ion: Fix dma direction for dma_sync_sg_for_cpu/device (diff) | |
| download | linux-dev-29a9b0008d5ddbea8a6dcfd5aecc866585f6048e.tar.xz linux-dev-29a9b0008d5ddbea8a6dcfd5aecc866585f6048e.zip | |
Merge tag 'staging-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH:
"Here are three staging driver fixes for 4.15-rc6
The first resolves a bug in the lustre driver that came about due to a
broken cleanup patch, due to crazy list usage in that codebase.
The remaining two are ion driver fixes, finally getting the CMA
interaction to work properly, resolving two regressions in that area
of the code.
All have been in linux-next with no reported issues for a while"
* tag 'staging-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: android: ion: Fix dma direction for dma_sync_sg_for_cpu/device
staging: ion: Fix ion_cma_heap allocations
staging: lustre: lnet: Fix recent breakage from list_for_each conversion
Diffstat (limited to 'drivers/base')
0 files changed, 0 insertions, 0 deletions