]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 131ad0b dc293f2)
Merge tag 'xtensa-20201119' of git://github.com/jcmvbkbc/linux-xtensa
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Nov 2020 19:22:33 +0000 (11:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Nov 2020 19:22:33 +0000 (11:22 -0800)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.