diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-21 11:18:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-21 11:18:31 -0700 |
| commit | 80d6191ea7e96017ab607843c63a215d5f2f8a58 (patch) | |
| tree | 4309b338fae5a22ae25d63524d5f7ad37a1b8004 /net/unix/sysctl_net_unix.c | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
| parent | 9f86745722d95bc7f855069bd82285bd10dc97ff (diff) | |
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 last minute bug fixes for 3.16, including a fix for ptrace
to close a hole which allowed a user space program to write to the
kernel address space"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: fix restore of invalid floating-point-control
s390/zcrypt: improve device probing for zcrypt adapter cards
s390/ptrace: fix PSW mask check
s390/MSI: Use standard mask and unmask funtions
s390/3270: correct size detection with the read-partition command
s390: require mvcos facility, not tod clock steering facility
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions