summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-12-31 21:48:09 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-12-31 21:48:09 +0300
commit29a9b0008d5ddbea8a6dcfd5aecc866585f6048e (patch)
tree84a6380629804eacf37f3d470c2ab6d2f62d5dfd /lib
parentbc7236fbb864ff4bc41416ad45e997cc7f05f64e (diff)
parentd6b246bb7a29703f53aa4c050b8b3205d749caee (diff)
downloadlinux-29a9b0008d5ddbea8a6dcfd5aecc866585f6048e.tar.xz
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 'lib')
0 files changed, 0 insertions, 0 deletions