diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-10 10:36:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-10 10:36:07 -0800 |
| commit | 2da33f9f96dabd62d6c7780cbce15818c2a6ce24 (patch) | |
| tree | 156ba6512cd0a07f1a3c1dcc99991d153e19bb56 /mm/filemap.c | |
| parent | 8e0f93cda48ed054e1216bab5c60017e1a5fc1e8 (diff) | |
| parent | 3446c13b268af86391d06611327006b059b8bab1 (diff) | |
| download | linux-2da33f9f96dabd62d6c7780cbce15818c2a6ce24.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Three bug fixes:
- The fix for the page table corruption (CVE-2016-2143)
- The diagnose statistics introduced a regression for the dasd diag
driver
- Boot crash on systems without the set-program-parameters facility"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/mm: four page table levels vs. fork
s390/cpumf: Fix lpp detection
s390/dasd: fix diag 0x250 inline assembly
Diffstat (limited to 'mm/filemap.c')
0 files changed, 0 insertions, 0 deletions