From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Apr 2018 03:27:23 +0000 (-0700)
Subject: Merge tag 'riscv-for-linus-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.17-rc3~36
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c6dc3e711a28b6b4c5e63f2bca34a5cfd35e9a22;p=nvme.git

Merge tag 'riscv-for-linus-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux

Pull RISC-V fixes from Palmer Dabbelt:
 "This contains three small fixes related to the RISC-V port that I'd
  like to target for 4.17-rc3:

   - a Kconfig cleanup to select DMA_DIRECT_OPS instead of redefining it
     in arch/riscv

   - the removal of asm/handle_irq.h, which doesn't exist, from our arch
     header list

   - the addition of "-no-pie" the link rules for our VDSO-related
     files, which fixes the build on systems where PIE is enabled by
     default"

* tag 'riscv-for-linus-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
  RISC-V: build vdso-dummy.o with -no-pie
  riscv: there is no <asm/handle_irq.h>
  riscv: select DMA_DIRECT_OPS instead of redefining it
---

c6dc3e711a28b6b4c5e63f2bca34a5cfd35e9a22