From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Nov 2020 19:22:33 +0000 (-0800)
Subject: Merge tag 'xtensa-20201119' of git://github.com/jcmvbkbc/linux-xtensa
X-Git-Tag: ceph-for-5.11-rc1~191
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3494d58865ad4a47611dbb427b214cc5227fa5eb;p=ceph-client.git

Merge tag 'xtensa-20201119' of git://github.com/jcmvbkbc/linux-xtensa

Pull xtensa fixes from Max Filippov:

 - fix placement of cache alias remapping area

 - disable preemption around cache alias management calls

 - add missing __user annotation to strncpy_from_user argument

* tag 'xtensa-20201119' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: uaccess: Add missing __user to strncpy_from_user() prototype
  xtensa: disable preemption around cache alias management calls
  xtensa: fix TLBTEMP area placement
---

3494d58865ad4a47611dbb427b214cc5227fa5eb