| commit | d7293f79caea45c50c0ab4294847e7af96501ced | [log] [tgz] |
|---|---|---|
| author | Christoph Hellwig <hch@lst.de> | Thu Nov 21 18:13:03 2019 +0100 |
| committer | Christoph Hellwig <hch@lst.de> | Thu Nov 21 18:13:03 2019 +0100 |
| tree | 04d55fbe33562f4d242e0445baae55690ebb6682 | |
| parent | 68a33b1794665ba8a1d1ef1d3bfcc7c587d380a6 [diff] | |
| parent | bff3b04460a80f425442fe8e5c6ee8c3ebef611f [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.