Merge tag 'asm-generic-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Jan 2020 18:17:15 +0000 (10:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Jan 2020 18:17:15 +0000 (10:17 -0800)
commit67373994d275c78043d7e9256ad31d8ebb9b065d
tree59c3df45ec86fa022bd09ef8c4400d7579d08e8e
parentc21ed4d9a636500e66642221d3880c3f9569964f
parent060dc911501f6ee222569304f50962172a52b1d6
Merge tag 'asm-generic-5.5' of git://git./linux/kernel/git/arnd/playground

Pull asm-generic fixes from Arnd Bergmann:
 "Here are two bugfixes from Mike Rapoport, both fixing compile-time
  errors for the nds32 architecture that were recently introduced"

* tag 'asm-generic-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground:
  nds32: fix build failure caused by page table folding updates
  asm-generic/nds32: don't redefine cacheflush primitives