diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-05 11:26:09 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-05 11:26:09 -0800 |
commit | d8887f1c7289848e74c92bd4322789a9cd7de699 (patch) | |
tree | 4eaa45349cfca86035cc5f7cc0940168bbc266f2 /crypto/salsa20_generic.c | |
parent | 5866bec2f47fe0da5fd4c503adbd4ad65182eafe (diff) | |
parent | 9a0e7120109632910e77295ce6fc512c16cd367b (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"9 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mailmap: update Mark Yao's email address
userfaultfd: clear the vma->vm_userfaultfd_ctx if UFFD_EVENT_FORK fails
mm/sparse.c: wrong allocation for mem_section
mm/zsmalloc.c: include fs.h
mm/debug.c: provide useful debugging information for VM_BUG
kernel/exit.c: export abort() to modules
mm/mprotect: add a cond_resched() inside change_pmd_range()
kernel/acct.c: fix the acct->needcheck check in check_free_space()
mm: check pfn_valid first in zero_resv_unavail
Diffstat (limited to 'crypto/salsa20_generic.c')
0 files changed, 0 insertions, 0 deletions