From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 9 Apr 2017 16:05:25 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Tag: MMI-PSA29.97-13-9~5846
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=462e9a355e7488fde3712c3b2585fc2f2a2c263d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "A number of ARM fixes:

   - prevent oopses caused by dma_get_sgtable() and declared DMA
     coherent memory

   - fix boot failure on nommu caused by ID_PFR1 access

   - a number of kprobes fixes from Jon Medhurst and Masami Hiramatsu"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8665/1: nommu: access ID_PFR1 only if CPUID scheme
  ARM: dma-mapping: disallow dma_get_sgtable() for non-kernel managed memory
  arm: kprobes: Align stack to 8-bytes in test code
  arm: kprobes: Fix the return address of multiple kretprobes
  arm: kprobes: Skip single-stepping in recursing path if possible
  arm: kprobes: Allow to handle reentered kprobe on single-stepping
---

462e9a355e7488fde3712c3b2585fc2f2a2c263d