commit ae67e87f408bbf2533f246049d6e66320f3b7a81
author Linus Torvalds <torvalds@linux-foundation.org> Wed Nov 09 11:09:40 2016 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Nov 09 11:09:40 2016 -0800
tree fed4dd38e3c72f49d72aa725fa718ca338088faf
parent e3a00f68e426df24a5fb98956a1bd1b23943aa1e
parent 7f8d61f005228fc48e6e2ca3c9af3302cd4870af

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