Commit 1e0d27fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "18 patches.

  Subsystems affected by this patch series: mm (hugetlb, compaction,
  vmalloc, shmem, memblock, pagecache, kasan, and hugetlb), mailmap,
  gcov, ubsan, and MAINTAINERS"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  MAINTAINERS/.mailmap: use my @kernel.org address
  mm: hugetlb: fix missing put_page in gather_surplus_pages()
  ubsan: implement __ubsan_handle_alignment_assumption
  kasan: make addr_has_metadata() return true for valid addresses
  kasan: add explicit preconditions to kasan_report()
  mm/filemap: add missing mem_cgroup_uncharge() to __add_to_page_cache_locked()
  mailmap: add entries for Manivannan Sadhasivam
  mailmap: fix name/email for Viresh Kumar
  memblock: do not start bottom-up allocations with kernel_end
  mm: thp: fix MADV_REMOVE deadlock on shmem THP
  init/gcov: allow CONFIG_CONSTRUCTORS on UML to fix module gcov
  mm/vmalloc: separate put pages and flush VM flags
  mm, compaction: move high_pfn to the for loop scope
  mm: migrate: do not migrate HugeTLB page whose refcount is one
  mm: hugetlb: remove VM_BUG_ON_PAGE from page_huge_active
  mm: hugetlb: fix a race between isolating and freeing page
  mm: hugetlb: fix a race between freeing and dissolving the page
  mm: hugetlbfs: fix cannot migrate the fallocated HugeTLB page
parents 17fbcdf9 654eb3f2

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ Li Yang <leoyang.li@nxp.com> <leoli@freescale.com> 
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>

Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>

Mark Brown <broonie@sirena.org.uk>
@@ -244,6 +246,7 @@ Morten Welinder <welinder@anemone.rentec.com> 
Morten Welinder <welinder@darter.rentec.com>

Morten Welinder <welinder@troll.com>

Mythri P K <mythripk@ti.com>

Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>

Nguyen Anh Quynh <aquynh@gmail.com>

Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>

Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
@@ -334,6 +337,8 @@ Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org> 
Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>

Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>

Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>

Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.org>

Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.com>

Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>

Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4304,7 +4304,7 @@ S: Maintained 
F:	.clang-format









CLANG/LLVM BUILD SUPPORT









M:	Nathan Chancellor <natechancellor@gmail.com>









M:	Nathan Chancellor <nathan@kernel.org>









M:	Nick Desaulniers <ndesaulniers@google.com>









L:	clang-built-linux@googlegroups.com









S:	Supported
































fs/hugetlbfs/inode.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -735,9 +735,10 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset,

















		mutex_unlock(&hugetlb_fault_mutex_table[hash]);



















		set_page_huge_active(page);









		/*









		 * unlock_page because locked by add_to_page_cache()









		 * page_put due to reference from alloc_huge_page()









		 * put_page() due to reference from alloc_huge_page()









		 */









		unlock_page(page);









		put_page(page);
































include/linux/hugetlb.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -770,6 +770,8 @@ static inline void huge_ptep_modify_prot_commit(struct vm_area_struct *vma,







}









#endif



















void set_page_huge_active(struct page *page);



















#else	/* CONFIG_HUGETLB_PAGE */









struct hstate {};










































include/linux/kasan.h



+7
−0






























Original line number
Diff line number
Diff line







@@ -333,6 +333,13 @@ static inline void *kasan_reset_tag(const void *addr)







	return (void *)arch_kasan_reset_tag(addr);









}



















/**









 * kasan_report - print a report about a bad memory access detected by KASAN









 * @addr: address of the bad access









 * @size: size of the bad access









 * @is_write: whether the bad access is a write or a read









 * @ip: instruction pointer for the accessibility check or the bad access itself









 */









bool kasan_report(unsigned long addr, size_t size,









		bool is_write, unsigned long ip);