From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Nov 2016 19:09:40 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: Ubuntu-5.10.0-12.13~11522
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ae67e87f408bbf2533f246049d6e66320f3b7a81;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Martin Schwidefsky:
 "Two bug fixes

   - a memory alignment fix in the s390 only hypfs code

   - a fix for the generic percpu code that caused ftrace to break on
     s390. This is not relevant for x86 but for all architectures that
     use the generic percpu code"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  percpu: use notrace variant of preempt_disable/preempt_enable
  s390/hypfs: Use get_free_page() instead of kmalloc to ensure page alignment
---

ae67e87f408bbf2533f246049d6e66320f3b7a81