From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Jan 2018 20:17:33 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v4.15-rc7~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3eac69038322f52b7366e4e6bbdb06e749714133;p=users%2Fjedix%2Flinux-maple.git

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

Pull s390 fixes from Martin Schwidefsky:
 "Four bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/dasd: fix wrongly assigned configuration data
  s390: fix preemption race in disable_sacf_uaccess
  s390/sclp: disable FORTIFY_SOURCE for early sclp code
  s390/pci: handle insufficient resources during dma tlb flush
---

3eac69038322f52b7366e4e6bbdb06e749714133