diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-18 11:55:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-18 11:55:31 -0700 |
commit | f5ce0466dc96326e07b52b8fc170c91bc234beb3 (patch) | |
tree | 57289971b637dd82d5d551e34cda4399cbe2a7b9 /init | |
parent | c98ff1d013d2d53911c4b3e8ba14c7cd141cf1ed (diff) | |
parent | d2f7eca60b29006285d57c7035539e33300e89e5 (diff) |
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
- Halve maximum number of CPUs if DEBUG_KMAP_LOCAL is enabled
- Fix conversion for_each_membock() to for_each_mem_range()
- Fix footbridge PCI mapping
- Avoid uprobes hooking on thumb instructions
* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 9071/1: uprobes: Don't hook on thumb instructions
ARM: footbridge: fix PCI interrupt mapping
ARM: 9069/1: NOMMU: Fix conversion for_each_membock() to for_each_mem_range()
ARM: 9063/1: mm: reduce maximum number of CPUs if DEBUG_KMAP_LOCAL is enabled
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions