diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-02 19:41:13 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-02 19:41:13 +0300 |
| commit | f7b32e4c021fd788f13f6785e17efbc3eb05b351 (patch) | |
| tree | 540dda869ee5959c1260b9a3ecd495a7d7c51351 /arch/m68k | |
| parent | 731c7d3a205ba89b475b2aa71b5f13dd6ae3de56 (diff) | |
| parent | e64a5470dcd2900ab8f8f83638c00098b10e6300 (diff) | |
| download | linux-f7b32e4c021fd788f13f6785e17efbc3eb05b351.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull more s390 updates from Martin Schwidefsky:
- some cleanup for the hugetlbfs pte/pmd conversion functions
- the code to check for the minimum CPU type is converted from
assembler to C and an informational message is added in case the CPU
is not new enough to run the kernel
- bug fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/ftrace/jprobes: Fix conflict between jprobes and function graph tracing
s390: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO
s390/zcrypt: fix possible memory leak in ap_module_init()
s390/numa: only set possible nodes within node_possible_map
s390/als: fix compile with gcov enabled
s390/facilities: do not generate DWORDS define anymore
s390/als: print missing facilities on facility mismatch
s390/als: print machine type on facility mismatch
s390/als: convert architecture level set code to C
s390/sclp: move uninitialized data to data section
s390/zcrypt: Fix zcrypt suspend/resume behavior
s390/cio: fix premature wakeup during chp configure
s390/cio: convert cfg_lock mutex to spinlock
s390/mm: clean up pte/pmd encoding
Diffstat (limited to 'arch/m68k')
0 files changed, 0 insertions, 0 deletions