diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-22 09:49:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-22 09:49:08 -0800 |
| commit | cc079039c9b621868fd12bd457bf9b10a0fa68fc (patch) | |
| tree | 96ed1f0cee4c8cd66b9bd593640c962159314a3b /include/net/tls.h | |
| parent | a6b0373ffcd8950b9121195e09c5d7c73e6e9f5d (diff) | |
| parent | 9a63236f1ad82d71a98aa80320b6cb618fb32f44 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Three fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm/ksm.c: don't WARN if page is still mapped in remove_stable_node()
mm/memory_hotplug: don't access uninitialized memmaps in shrink_zone_span()
Revert "fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry()"
Diffstat (limited to 'include/net/tls.h')
0 files changed, 0 insertions, 0 deletions