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. I keep the fingers crossed that we now got transparent huge pages ready for prime time." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/cio: fix length calculation in idset.c s390/sclp: fix addressing mode clobber s390: Move css limits from drivers/s390/cio/ to include/asm/. s390/thp: respect page protection in pmd_none() and pmd_present() s390/mm: use pmd_large() instead of pmd_huge() s390/cio: suppress 2nd path verification during resume
Showing
- arch/s390/include/asm/cio.h 2 additions, 0 deletionsarch/s390/include/asm/cio.h
- arch/s390/include/asm/pgtable.h 22 additions, 13 deletionsarch/s390/include/asm/pgtable.h
- arch/s390/kernel/sclp.S 7 additions, 1 deletionarch/s390/kernel/sclp.S
- arch/s390/lib/uaccess_pt.c 1 addition, 1 deletionarch/s390/lib/uaccess_pt.c
- arch/s390/mm/gup.c 1 addition, 1 deletionarch/s390/mm/gup.c
- drivers/s390/cio/css.h 0 additions, 3 deletionsdrivers/s390/cio/css.h
- drivers/s390/cio/device.c 1 addition, 7 deletionsdrivers/s390/cio/device.c
- drivers/s390/cio/idset.c 1 addition, 2 deletionsdrivers/s390/cio/idset.c
Loading
Please register or sign in to comment