From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 31 Mar 2022 18:43:01 +0000 (-0700)
Subject: Merge tag 'hardening-v5.18-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f87cbd0565eb7e2fa15296c74210658db1346431;p=linux.git

Merge tag 'hardening-v5.18-rc1-fix1' of git://git./linux/kernel/git/kees/linux

Pull hardening updates from Kees Cook:
 "This addresses an -Warray-bounds warning found under a few ARM
  defconfigs, and disables long-broken HARDENED_USERCOPY_PAGESPAN"

* tag 'hardening-v5.18-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  ARM/dma-mapping: Remove CMA code when not built with CMA
  usercopy: Disable CONFIG_HARDENED_USERCOPY_PAGESPAN
---

f87cbd0565eb7e2fa15296c74210658db1346431