git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c23a757 6137e41)
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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.