Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jan 2022 06:02:46 +0000 (08:02 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jan 2022 06:02:46 +0000 (08:02 +0200)
commita08b41ab9e2e468647f78eb17c28e29b93006394
tree4f003e7e5e8632e382ce621f93714e8a93f7e3cd
parentdd81e1c7d5fb126e5fbc5c9e334d7b3ec29a16a0
parent9f80ccda53b9417236945bc7ece4b519037df74d
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:

 - Fix panic whe both KASAN and KPROBEs are enabled

 - Avoid alignment faults in copy_*_kernel_nofault()

 - Align SMP alternatives in modules

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9180/1: Thumb2: align ALT_UP() sections in modules sufficiently
  ARM: 9179/1: uaccess: avoid alignment faults in copy_[from|to]_kernel_nofault
  ARM: 9170/1: fix panic when kasan and kprobe are enabled