Commit 7ce32ac6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "24 patches, based on 4a09d388.

  Subsystems affected by this patch series: mm (thp, vmalloc, hugetlb,
  memory-failure, and pagealloc), nilfs2, kthread, MAINTAINERS, and
  mailmap"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (24 commits)
  mailmap: add Marek's other e-mail address and identity without diacritics
  MAINTAINERS: fix Marek's identity again
  mm/page_alloc: do bulk array bounds check after checking populated elements
  mm/page_alloc: __alloc_pages_bulk(): do bounds check before accessing array
  mm/hwpoison: do not lock page again when me_huge_page() successfully recovers
  mm,hwpoison: return -EHWPOISON to denote that the page has already been poisoned
  mm/memory-failure: use a mutex to avoid memory_failure() races
  mm, futex: fix shared futex pgoff on shmem huge page
  kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync()
  kthread_worker: split code for canceling the delayed work timer
  mm/vmalloc: unbreak kasan vmalloc support
  KVM: s390: prepare for hugepage vmalloc
  mm/vmalloc: add vmalloc_no_huge
  nilfs2: fix memory leak in nilfs_sysfs_delete_device_group
  mm/thp: another PVMW_SYNC fix in page_vma_mapped_walk()
  mm/thp: fix page_vma_mapped_walk() if THP mapped by ptes
  mm: page_vma_mapped_walk(): get vma_address_end() earlier
  mm: page_vma_mapped_walk(): use goto instead of while (1)
  mm: page_vma_mapped_walk(): add a level of indentation
  mm: page_vma_mapped_walk(): crossing page table boundary
  ...
parents 808e9df4 72a461ad

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -212,6 +212,8 @@ 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>

Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>

Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>

Mark Brown <broonie@sirena.org.uk>

Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>

Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1816,7 +1816,7 @@ F: drivers/pinctrl/pinctrl-gemini.c 
F:	drivers/rtc/rtc-ftrtc010.c









ARM/CZ.NIC TURRIS SUPPORT









M:	Marek Behun <kabel@kernel.org>









M:	Marek Behún <kabel@kernel.org>









S:	Maintained









W:	https://www.turris.cz/









F:	Documentation/ABI/testing/debugfs-moxtet








@@ -10945,7 +10945,7 @@ F:	include/linux/mv643xx.h















MARVELL MV88X3310 PHY DRIVER









M:	Russell King <linux@armlinux.org.uk>









M:	Marek Behun <marek.behun@nic.cz>









M:	Marek Behún <kabel@kernel.org>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/phy/marvell10g.c
































arch/s390/kvm/pv.c



+6
−1






























Original line number
Diff line number
Diff line







@@ -140,7 +140,12 @@ static int kvm_s390_pv_alloc_vm(struct kvm *kvm)







	/* Allocate variable storage */









	vlen = ALIGN(virt * ((npages * PAGE_SIZE) / HPAGE_SIZE), PAGE_SIZE);









	vlen += uv_info.guest_virt_base_stor_len;









	kvm->arch.pv.stor_var = vzalloc(vlen);









	/*









	 * The Create Secure Configuration Ultravisor Call does not support









	 * using large pages for the virtual memory area.









	 * This is a hardware limitation.









	 */









	kvm->arch.pv.stor_var = vmalloc_no_huge(vlen);









	if (!kvm->arch.pv.stor_var)









		goto out_err;









	return 0;
































fs/nilfs2/sysfs.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -1053,6 +1053,7 @@ void nilfs_sysfs_delete_device_group(struct the_nilfs *nilfs)







	nilfs_sysfs_delete_superblock_group(nilfs);









	nilfs_sysfs_delete_segctor_group(nilfs);









	kobject_del(&nilfs->ns_dev_kobj);









	kobject_put(&nilfs->ns_dev_kobj);









	kfree(nilfs->ns_dev_subgroups);









}










































include/linux/hugetlb.h



+0
−16






























Original line number
Diff line number
Diff line







@@ -741,17 +741,6 @@ static inline int hstate_index(struct hstate *h)







	return h - hstates;









}



















pgoff_t __basepage_index(struct page *page);



















/* Return page->index in PAGE_SIZE units */









static inline pgoff_t basepage_index(struct page *page)









{









	if (!PageCompound(page))









		return page->index;



















	return __basepage_index(page);









}



















extern int dissolve_free_huge_page(struct page *page);









extern int dissolve_free_huge_pages(unsigned long start_pfn,









				    unsigned long end_pfn);








@@ -988,11 +977,6 @@ static inline int hstate_index(struct hstate *h)







	return 0;









}



















static inline pgoff_t basepage_index(struct page *page)









{









	return page->index;









}



















static inline int dissolve_free_huge_page(struct page *page)









{









	return 0;