• Linus Torvalds's avatar
    Merge branch 'akpm' (patches from Andrew) · bc2dbc54
    Linus Torvalds authored
    Merge misc fixes from Andrew Morton:
     "16 fixes"
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
      kasan: fix memory hotplug during boot
      kasan: free allocated shadow memory on MEM_CANCEL_ONLINE
      checkpatch: fix macro argument precedence test
      init/main.c: include <linux/mem_encrypt.h>
      kernel/sys.c: fix potential Spectre v1 issue
      mm/memory_hotplug: fix leftover use of struct page during hotplug
      proc: fix smaps and meminfo alignment
      mm: do not warn on offline nodes unless the specific node is explicitly requested
      mm, memory_hotplug: make has_unmovable_pages more robust
      mm/kasan: don't vfree() nonexistent vm_area
      MAINTAINERS: change hugetlbfs maintainer and update files
      ipc/shm: fix shmat() nil address after round-down when remapping
      Revert "ipc/shm: Fix shmat mmap nil-page protection"
      idr: fix invalid ptr dereference on item delete
      ocfs2: revert "ocfs2/o2hb: check len for bio_add_page() to avoid getting incorrect bio"
      mm: fix nr_rotate_swap leak in swapon() error case