]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 68a33b1 bff3b04)
Merge branch 'for-next/zone-dma' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorChristoph Hellwig <hch@lst.de>
Thu, 21 Nov 2019 17:13:03 +0000 (18:13 +0100)
committerChristoph Hellwig <hch@lst.de>
Thu, 21 Nov 2019 17:13:03 +0000 (18:13 +0100)
commitd7293f79caea45c50c0ab4294847e7af96501ced
tree04d55fbe33562f4d242e0445baae55690ebb6682tree | snapshot
parent68a33b1794665ba8a1d1ef1d3bfcc7c587d380a6commit | diff
parentbff3b04460a80f425442fe8e5c6ee8c3ebef611fcommit | diff
Merge branch 'for-next/zone-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into dma-mapping-for-next

Pull in a stable branch from the arm64 tree that adds the zone_dma_bits
variable to avoid creating hard to resolve conflicts with that addition.
arch/arm64/Kconfig diff1 | diff2 | blob | history
include/linux/dma-direct.h diff1 | diff2 | blob | history
kernel/dma/direct.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.