From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Jan 2020 18:17:15 +0000 (-0800)
Subject: Merge tag 'asm-generic-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd... 
X-Git-Tag: v5.10.7~3507
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67373994d275c78043d7e9256ad31d8ebb9b065d;p=platform%2Fkernel%2Flinux-rpi.git

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

67373994d275c78043d7e9256ad31d8ebb9b065d