From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Jan 2019 19:48:44 +0000 (-0800)
Subject: Merge tag 'powerpc-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: v5.4-rc1~1859
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1c2f8857c5aa6c92aa903bc06437503422e5925;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'powerpc-4.21-2' of git://git./linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:
 "A fix for the recent access_ok() change, which broke the build. We
  recently added a use of type in order to squash a warning elsewhere
  about type being unused.

  A handful of other minor build fixes, and one defconfig update.

  Thanks to: Christian Lamparter, Christophe Leroy, Diana Craciun,
  Mathieu Malaterre"

* tag 'powerpc-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: Drop use of 'type' from access_ok()
  KVM: PPC: Book3S HV: radix: Fix uninitialized var build error
  powerpc/configs: Add PPC4xx_OCM to ppc40x_defconfig
  powerpc/4xx/ocm: Fix phys_addr_t printf warnings
  powerpc/4xx/ocm: Fix compilation error due to PAGE_KERNEL usage
  powerpc/fsl: Fixed warning: orphan section `__btb_flush_fixup'
---

f1c2f8857c5aa6c92aa903bc06437503422e5925