From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Aug 2018 14:38:21 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v4.19~333
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9617ba395f05f2f836d078363463f8978b0f73bc;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./linux/kernel/git/davem/sparc

Pull sparc updates from David Miller:
 "Nothing super serious:

   - Convert sparc32 over to NO_BOOTMEM (Mike Rapoport)

   - Use dma_noncoherent_ops on sparc32 (Christoph Hellwig)

   - Fix kbuild defconfig handling on sparc32 (Masahiro Yamada)"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: fix KBUILD_DEFCONFIG for ARCH=sparc32
  sparc32: split ramdisk detection and reservation to a helper function
  sparc32: switch to NO_BOOTMEM
  sparc: mm/init_32: kill trailing whitespace
  sparc: use generic dma_noncoherent_ops
---

9617ba395f05f2f836d078363463f8978b0f73bc