| commit | 3eac69038322f52b7366e4e6bbdb06e749714133 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 05 12:17:33 2018 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 05 12:17:33 2018 -0800 |
| tree | ba00fba16bea1ffcc56d28c5653268ca7dc9389c | |
| parent | 925cbd7ed4b073a2afc9915e241ab789b44a3f61 [diff] | |
| parent | 8a9bd4f8ebc6800bfc0596e28631ff6809a2f615 [diff] |
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