diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-26 11:58:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-26 11:58:21 -0700 |
| commit | 9d646c97e1abf777cf229031365860e7bc1c588c (patch) | |
| tree | 25a0f2700c0ffeae5b99a43b71bf84172c48a2c0 /net/unix/af_unix.c | |
| parent | Linux 4.12-rc7 (diff) | |
| parent | s390/ipl: revert Load Normal semantics for LPAR CCW-type re-IPL (diff) | |
| download | wireguard-linux-9d646c97e1abf777cf229031365860e7bc1c588c.tar.xz wireguard-linux-9d646c97e1abf777cf229031365860e7bc1c588c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 bugfix from Martin Schwidefsky:
"One last s390 patch for 4.12
Revert the re-IPL semantics back to the v4.7 state. It turned out that
the memory layout may change due to memory hotplug if load-normal is
used"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/ipl: revert Load Normal semantics for LPAR CCW-type re-IPL
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions