]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Apr 2021 18:55:31 +0000 (11:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Apr 2021 18:55:31 +0000 (11:55 -0700)
commitf5ce0466dc96326e07b52b8fc170c91bc234beb3
tree57289971b637dd82d5d551e34cda4399cbe2a7b9
parentc98ff1d013d2d53911c4b3e8ba14c7cd141cf1ed
parentd2f7eca60b29006285d57c7035539e33300e89e5
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
arch/arm/Kconfig