]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'xtensa-20180225' of git://github.com/jcmvbkbc/linux-xtensa
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Feb 2018 01:02:24 +0000 (17:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Feb 2018 01:02:24 +0000 (17:02 -0800)
commite1171aca7da6407c0e65ffb1f38509ee4486a3e7
treefdcb399884487631d112719669662dbf0293c425
parentc23a75759191e84f4ba15b85ea4f97bd544b5362
parent6137e4166004e2ec383ac05d5ca15831f4668806
Merge tag 'xtensa-20180225' of git://github.com/jcmvbkbc/linux-xtensa

Pull Xtensa fixes from Max Filippov:
 "Two fixes for reserved memory/DMA buffers allocation in high memory on
  xtensa architecture

   - fix memory accounting when reserved memory is in high memory region

   - fix DMA allocation from high memory"

* tag 'xtensa-20180225' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: support DMA buffers in high memory
  xtensa: fix high memory/reserved memory collision