]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Apr 2017 16:05:25 +0000 (09:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Apr 2017 16:05:25 +0000 (09:05 -0700)
commitac02451a59ab357560fcafc79321ed40d4fc5106
tree2f1cdf7e4b72281f9fba51b6d1515c2b46f8434b
parentbc250c1fdf53e3f4bbd000afa4ac70413d58d751
parent2621beca29d7d07cc1a73fe3aac5f1c374044680
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