From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Jan 2022 06:02:46 +0000 (+0200)
Subject: Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a08b41ab9e2e468647f78eb17c28e29b93006394;p=linux.git

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
---

a08b41ab9e2e468647f78eb17c28e29b93006394