From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Apr 2018 19:27:11 +0000 (-0700)
Subject: Merge tag 'sh-for-4.17' of git://git.libc.org/linux-sh
X-Git-Tag: v4.17-rc1~24
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1bad9ce155a7c010a9a5f3261ad12a6a8eccfb2c;p=linux-block.git

Merge tag 'sh-for-4.17' of git://git.libc.org/linux-sh

Pull arch/sh updates from Rich Felker:
 "Fixes for bugs in futex, device tree, and userspace breakpoint traps,
  and for PCI issues on SH7786"

* tag 'sh-for-4.17' of git://git.libc.org/linux-sh:
  arch/sh: pcie-sh7786: handle non-zero DMA offset
  arch/sh: pcie-sh7786: adjust the memory mapping
  arch/sh: pcie-sh7786: adjust PCI MEM and IO regions
  arch/sh: pcie-sh7786: exclude unusable PCI MEM areas
  arch/sh: pcie-sh7786: mark unavailable PCI resource as disabled
  arch/sh: pci: don't use disabled resources
  arch/sh: make the DMA mapping operations observe dev->dma_pfn_offset
  arch/sh: add sh7786_mm_sel() function
  sh: fix debug trap failure to process signals before return to user
  sh: fix memory corruption of unflattened device tree
  sh: fix futex FUTEX_OP_SET op on userspace addresses
---

1bad9ce155a7c010a9a5f3261ad12a6a8eccfb2c