diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-04 19:38:51 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-04 19:38:51 -0800 |
commit | 36487907f34131c7e3df5b1e6b30b4e3dfcdc0af (patch) | |
tree | b9447ef2923c8d21a3f1f6fec0f9cd33ebafb4e9 /net/core/sock_diag.c | |
parent | a125bcda2d0aee1d98b51c167aca60fb312572aa (diff) | |
parent | 7312b70699252074d753c5005fc67266c547bbe3 (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"17 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
hexagon: define ioremap_uc
ocfs2: fix the crash due to call ocfs2_get_dlm_debug once less
ocfs2: call journal flush to mark journal as empty after journal recovery when mount
mm/hugetlb: defer freeing of huge pages if in non-task context
mm/gup: fix memory leak in __gup_benchmark_ioctl
mm/oom: fix pgtables units mismatch in Killed process message
fs/posix_acl.c: fix kernel-doc warnings
hexagon: work around compiler crash
hexagon: parenthesize registers in asm predicates
fs/namespace.c: make to_mnt_ns() static
fs/nsfs.c: include headers for missing declarations
fs/direct-io.c: include fs/internal.h for missing prototype
mm: move_pages: return valid node id in status if the page is already on the target node
memcg: account security cred as well to kmemcg
kcov: fix struct layout for kcov_remote_arg
mm/zsmalloc.c: fix the migrated zspage statistics.
mm/memory_hotplug: shrink zones when offlining memory
Diffstat (limited to 'net/core/sock_diag.c')
0 files changed, 0 insertions, 0 deletions