diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-28 00:16:30 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-28 00:16:30 +0300 |
commit | 55bea71ed549398133732425a631b2268446526c (patch) | |
tree | 7546e1508c295345c5a30d0f7732b03e8502ac54 /drivers/w1 | |
parent | 7618c6a17f6afae973e5c7b73e1ca80d0c8b8c2a (diff) | |
parent | 4a65429457a5d271dd3b00598b3ec75fe8b5103c (diff) | |
download | linux-55bea71ed549398133732425a631b2268446526c.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"A few more s390 patches for 4.9:
- a fix for an overflow in the dasd driver reported by UBSAN
- fix a regression and add hotplug memory to the zone movable again
- add ignore defines for the pkey system calls
- fix the ouput of the merged stack tracer
- replace printk with pr_cont in arch/s390 where appropriate
- remove the arch specific return_address function again
- ignore reserved channel paths at boot time
- add a missing hugetlb_bad_size call to the arch backend"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/mm: fix zone calculation in arch_add_memory()
s390/dumpstack: use pr_cont within show_stack and die
s390/dumpstack: get rid of return_address again
s390/disassambler: use pr_cont where appropriate
s390/dumpstack: use pr_cont where appropriate
s390/dumpstack: restore reliable indicator for call traces
s390/mm: use hugetlb_bad_size()
s390/cio: don't register chpids in reserved state
s390: ignore pkey system calls
s390/dasd: avoid undefined behaviour
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions