Commit bcb6058a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2026-01-29-09-41' of... 

Merge tag 'mm-hotfixes-stable-2026-01-29-09-41' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "16 hotfixes.  9 are cc:stable, 12 are for MM.

  There's a patch series from Pratyush Yadav which fixes a few things in
  the new-in-6.19 LUO memfd code.

  Plus the usual shower of singletons - please see the changelogs for
  details"

* tag 'mm-hotfixes-stable-2026-01-29-09-41' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  vmcoreinfo: make hwerr_data visible for debugging
  mm/zone_device: reinitialize large zone device private folios
  mm/mm_init: don't cond_resched() in deferred_init_memmap_chunk() if called from deferred_grow_zone()
  mm/kfence: randomize the freelist on initialization
  kho: kho_preserve_vmalloc(): don't return 0 when ENOMEM
  kho: init alloc tags when restoring pages from reserved memory
  mm: memfd_luo: restore and free memfd_luo_ser on failure
  mm: memfd_luo: use memfd_alloc_file() instead of shmem_file_setup()
  memfd: export alloc_file()
  flex_proportions: make fprop_new_period() hardirq safe
  mailmap: add entry for Viacheslav Bocharov
  mm/memory-failure: teach kill_accessing_process to accept hugetlb tail page pfn
  mm/memory-failure: fix missing ->mf_stats count in hugetlb poison
  mm, swap: restore swap_space attr aviod kernel panic
  mm/kasan: fix KASAN poisoning in vrealloc()
  mm/shmem, swap: fix race of truncate and swap entry split
parents 1cac3891 bd587829

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -851,6 +851,7 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com> 
Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>

Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>

Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>

Viacheslav Bocharov <v@baodeep.com> <adeep@lexina.in>

Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>

Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>

Vincent Mailhol <mailhol@kernel.org> <mailhol.vincent@wanadoo.fr>

arch/powerpc/kvm/book3s_hv_uvmem.c

+1 −1
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ static struct page *kvmppc_uvmem_get_page(unsigned long gpa, struct kvm *kvm) 


	dpage = pfn_to_page(uvmem_pfn);

	dpage->zone_device_data = pvt;

	zone_device_page_init(dpage, 0);

	zone_device_page_init(dpage, &kvmppc_uvmem_pgmap, 0);

	return dpage;

out_clear:

	spin_lock(&kvmppc_uvmem_bitmap_lock);

drivers/gpu/drm/amd/amdkfd/kfd_migrate.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ svm_migrate_get_vram_page(struct svm_range *prange, unsigned long pfn) 
	page = pfn_to_page(pfn);

	svm_range_bo_ref(prange->svm_bo);

	page->zone_device_data = prange->svm_bo;

	zone_device_page_init(page, 0);

	zone_device_page_init(page, page_pgmap(page), 0);

}



static void

drivers/gpu/drm/drm_pagemap.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static void drm_pagemap_get_devmem_page(struct page *page, 
					struct drm_pagemap_zdd *zdd)

{

	page->zone_device_data = drm_pagemap_zdd_get(zdd);

	zone_device_page_init(page, 0);

	zone_device_page_init(page, page_pgmap(page), 0);

}



/**

drivers/gpu/drm/nouveau/nouveau_dmem.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ nouveau_dmem_page_alloc_locked(struct nouveau_drm *drm, bool is_large) 
			order = ilog2(DMEM_CHUNK_NPAGES);

	}



	zone_device_folio_init(folio, order);

	zone_device_folio_init(folio, page_pgmap(folio_page(folio, 0)), order);

	return page;

}