tree adb3af72959e6b502148f42bfe62a19c8618c5b7
parent c3b46c73264b03000d1e18b22f5caf63332547c9
parent 2fd92273646abad21766ddfbfa00b6f927362308
author Linus Torvalds <torvalds@linux-foundation.org> 1460999611 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1460999611 -0700

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

Pull s390 fixes from Martin Schwidefsky:
 "A couple of bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: add CPU_BIG_ENDIAN config option
  s390/spinlock: avoid yield to non existent cpu
  s390/dcssblk: fix possible deadlock in remove vs. per-device attributes
  s390/seccomp: include generic seccomp header file
  s390/pci: add extra padding to function measurement block
  s390/scm_blk: fix deadlock for requests != REQ_TYPE_FS