From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Feb 2018 01:02:24 +0000 (-0800)
Subject: Merge tag 'xtensa-20180225' of git://github.com/jcmvbkbc/linux-xtensa
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e1171aca7da6407c0e65ffb1f38509ee4486a3e7;p=linux.git

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
---

e1171aca7da6407c0e65ffb1f38509ee4486a3e7