Commit bc947af6 authored by Andrew Morton's avatar Andrew Morton
Browse files

Merge branch 'mm-hotfixes-stable' into mm-nonmm-stable in order to be able 

to merge "kho: make debugfs interface optional" into mm-nonmm-stable.
parents 58b6fcd2 7c9580f4

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com> 
David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>

David Heidelberg <david@ixit.cz> <d.okias@gmail.com>

David Hildenbrand <david@kernel.org> <david@redhat.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>

David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
@@ -687,6 +688,8 @@ Sachin Mokashi <sachin.mokashi@intel.com> <sachinx.mokashi@intel.com> 
Sachin P Sant <ssant@in.ibm.com>

Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>

Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>

Sam Protsenko <semen.protsenko@linaro.org>

Sam Protsenko <semen.protsenko@linaro.org> <semen.protsenko@globallogic.com>

Sam Ravnborg <sam@mars.ravnborg.org>

Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>

Santosh Shilimkar <santosh.shilimkar@oracle.org>

MAINTAINERS

+17 −16
Original line number Diff line number Diff line
@@ -11526,7 +11526,7 @@ F: include/linux/platform_data/huawei-gaokun-ec.h 
HUGETLB SUBSYSTEM

M:	Muchun Song <muchun.song@linux.dev>

M:	Oscar Salvador <osalvador@suse.de>

R:	David Hildenbrand <david@redhat.com>

R:	David Hildenbrand <david@kernel.org>

L:	linux-mm@kvack.org

S:	Maintained

F:	Documentation/ABI/testing/sysfs-kernel-mm-hugepages
@@ -13734,7 +13734,7 @@ KERNEL VIRTUAL MACHINE for s390 (KVM/s390) 
M:	Christian Borntraeger <borntraeger@linux.ibm.com>

M:	Janosch Frank <frankja@linux.ibm.com>

M:	Claudio Imbrenda <imbrenda@linux.ibm.com>

R:	David Hildenbrand <david@redhat.com>

R:	David Hildenbrand <david@kernel.org>

L:	kvm@vger.kernel.org

S:	Supported

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
@@ -13800,6 +13800,7 @@ F: Documentation/admin-guide/mm/kho.rst 
F:	Documentation/core-api/kho/*

F:	include/linux/kexec_handover.h

F:	kernel/kexec_handover.c

F:	lib/test_kho.c

F:	tools/testing/selftests/kho/









KEYS-ENCRYPTED








@@ -16222,7 +16223,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git







F:	drivers/devfreq/tegra30-devfreq.c

















MEMORY HOT(UN)PLUG









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









M:	Oscar Salvador <osalvador@suse.de>









L:	linux-mm@kvack.org









S:	Maintained








@@ -16247,7 +16248,7 @@ F:	tools/mm/















MEMORY MANAGEMENT - CORE









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









R:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









R:	Vlastimil Babka <vbabka@suse.cz>








@@ -16303,7 +16304,7 @@ F:	mm/execmem.c















MEMORY MANAGEMENT - GUP (GET USER PAGES)









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









R:	Jason Gunthorpe <jgg@nvidia.com>









R:	John Hubbard <jhubbard@nvidia.com>









R:	Peter Xu <peterx@redhat.com>








@@ -16319,7 +16320,7 @@ F:	tools/testing/selftests/mm/gup_test.c















MEMORY MANAGEMENT - KSM (Kernel Samepage Merging)









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









R:	Xu Xin <xu.xin16@zte.com.cn>









R:	Chengming Zhou <chengming.zhou@linux.dev>









L:	linux-mm@kvack.org








@@ -16335,7 +16336,7 @@ F:	mm/mm_slot.h















MEMORY MANAGEMENT - MEMORY POLICY AND MIGRATION









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









R:	Zi Yan <ziy@nvidia.com>









R:	Matthew Brost <matthew.brost@intel.com>









R:	Joshua Hahn <joshua.hahnjy@gmail.com>








@@ -16375,7 +16376,7 @@ F:	mm/workingset.c















MEMORY MANAGEMENT - MISC









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









R:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









R:	Vlastimil Babka <vbabka@suse.cz>








@@ -16463,7 +16464,7 @@ F:	mm/shuffle.h







MEMORY MANAGEMENT - RECLAIM









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Johannes Weiner <hannes@cmpxchg.org>









R:	David Hildenbrand <david@redhat.com>









R:	David Hildenbrand <david@kernel.org>









R:	Michal Hocko <mhocko@kernel.org>









R:	Qi Zheng <zhengqi.arch@bytedance.com>









R:	Shakeel Butt <shakeel.butt@linux.dev>








@@ -16476,7 +16477,7 @@ F:	mm/workingset.c















MEMORY MANAGEMENT - RMAP (REVERSE MAPPING)









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









M:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Rik van Riel <riel@surriel.com>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>








@@ -16500,12 +16501,12 @@ F:	mm/secretmem.c















MEMORY MANAGEMENT - SWAP









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Chris Li <chrisl@kernel.org>









M:	Kairui Song <kasong@tencent.com>









R:	Kemeng Shi <shikemeng@huaweicloud.com>









R:	Kairui Song <kasong@tencent.com>









R:	Nhat Pham <nphamcs@gmail.com>









R:	Baoquan He <bhe@redhat.com>









R:	Barry Song <baohua@kernel.org>









R:	Chris Li <chrisl@kernel.org>









L:	linux-mm@kvack.org









S:	Maintained









F:	Documentation/mm/swap-table.rst








@@ -16521,7 +16522,7 @@ F:	mm/swapfile.c















MEMORY MANAGEMENT - THP (TRANSPARENT HUGE PAGE)









M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









M:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Zi Yan <ziy@nvidia.com>









R:	Baolin Wang <baolin.wang@linux.alibaba.com>








@@ -16623,7 +16624,7 @@ MEMORY MAPPING - MADVISE (MEMORY ADVICE)







M:	Andrew Morton <akpm@linux-foundation.org>









M:	Liam R. Howlett <Liam.Howlett@oracle.com>









M:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









R:	Vlastimil Babka <vbabka@suse.cz>









R:	Jann Horn <jannh@google.com>









L:	linux-mm@kvack.org








@@ -27090,7 +27091,7 @@ F:	net/vmw_vsock/virtio_transport_common.c















VIRTIO BALLOON









M:	"Michael S. Tsirkin" <mst@redhat.com>









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









L:	virtualization@lists.linux.dev









S:	Maintained









F:	drivers/virtio/virtio_balloon.c








@@ -27245,7 +27246,7 @@ F:	drivers/iommu/virtio-iommu.c







F:	include/uapi/linux/virtio_iommu.h

















VIRTIO MEM DRIVER









M:	David Hildenbrand <david@redhat.com>









M:	David Hildenbrand <david@kernel.org>









L:	virtualization@lists.linux.dev









S:	Maintained









W:	https://virtio-mem.gitlab.io/

























arch/arm64/kernel/mte.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -476,7 +476,8 @@ static int __access_remote_tags(struct mm_struct *mm, unsigned long addr,

















		folio = page_folio(page);









		if (folio_test_hugetlb(folio))









			WARN_ON_ONCE(!folio_test_hugetlb_mte_tagged(folio));









			WARN_ON_ONCE(!folio_test_hugetlb_mte_tagged(folio) &&









				     !is_huge_zero_folio(folio));









		else









			WARN_ON_ONCE(!page_mte_tagged(page) && !is_zero_page(page));










































arch/arm64/mm/fault.c



+10
−0






























Original line number
Diff line number
Diff line







@@ -969,6 +969,16 @@ struct folio *vma_alloc_zeroed_movable_folio(struct vm_area_struct *vma,

















void tag_clear_highpage(struct page *page)









{









	/*









	 * Check if MTE is supported and fall back to clear_highpage().









	 * get_huge_zero_folio() unconditionally passes __GFP_ZEROTAGS and









	 * post_alloc_hook() will invoke tag_clear_highpage().









	 */









	if (!system_supports_mte()) {









		clear_highpage(page);









		return;









	}



















	/* Newly allocated page, shouldn't have been tagged yet */









	WARN_ON_ONCE(!try_page_mte_tagging(page));









	mte_zero_clear_page_tags(page_address(page));
































arch/powerpc/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -137,6 +137,7 @@ config PPC







	select ARCH_HAS_DMA_OPS			if PPC64









	select ARCH_HAS_FORTIFY_SOURCE









	select ARCH_HAS_GCOV_PROFILE_ALL









	select ARCH_HAS_GIGANTIC_PAGE		if ARCH_SUPPORTS_HUGETLBFS









	select ARCH_HAS_KCOV









	select ARCH_HAS_KERNEL_FPU_SUPPORT	if PPC64 && PPC_FPU









	select ARCH_HAS_MEMBARRIER_CALLBACKS