Commit 95c8a35f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-01-05-11-35' of... 

Merge tag 'mm-hotfixes-stable-2024-01-05-11-35' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc mm fixes from Andrew Morton:
 "12 hotfixes.

  Two are cc:stable and the remainder either address post-6.7 issues or
  aren't considered necessary for earlier kernel versions"

* tag 'mm-hotfixes-stable-2024-01-05-11-35' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mm: shrinker: use kvzalloc_node() from expand_one_shrinker_info()
  mailmap: add entries for Mathieu Othacehe
  MAINTAINERS: change vmware.com addresses to broadcom.com
  arch/mm/fault: fix major fault accounting when retrying under per-VMA lock
  mm/mglru: skip special VMAs in lru_gen_look_around()
  MAINTAINERS: hand over hwpoison maintainership to Miaohe Lin
  MAINTAINERS: remove hugetlb maintainer Mike Kravetz
  mm: fix unmap_mapping_range high bits shift bug
  mm: memcg: fix split queue list crash when large folio migration
  mm: fix arithmetic for max_prop_frac when setting max_ratio
  mm: fix arithmetic for bdi min_ratio
  mm: align larger anonymous mappings on THP boundaries
parents 0d3ac66e 7fba9420

.mailmap

+2 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com> 
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>

Mathieu Othacehe <m.othacehe@gmail.com>

Mathieu Othacehe <m.othacehe@gmail.com> <othacehe@gnu.org>

Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>

Mat Martineau <martineau@kernel.org> <mathewm@codeaurora.org>

Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
@@ -638,4 +638,5 @@ Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de> 
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>

Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yusuke Goda <goda.yusuke@renesas.com>

Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>

Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -2130,6 +2130,10 @@ S: 2213 La Terrace Circle 
S: San Jose, CA 95123

S: USA



N: Mike Kravetz

E: mike.kravetz@oracle.com

D: Maintenance and development of the hugetlb subsystem



N: Andreas S. Krebs

E: akrebs@altavista.net

D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards

MAINTAINERS

+6 −8
Original line number Diff line number Diff line
@@ -6901,8 +6901,8 @@ T: git git://anongit.freedesktop.org/drm/drm-misc 
F:	drivers/gpu/drm/vboxvideo/









DRM DRIVER FOR VMWARE VIRTUAL GPU









M:	Zack Rusin <zackr@vmware.com>









R:	VMware Graphics Reviewers <linux-graphics-maintainer@vmware.com>









M:	Zack Rusin <zack.rusin@broadcom.com>









R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>









L:	dri-devel@lists.freedesktop.org









S:	Supported









T:	git git://anongit.freedesktop.org/drm/drm-misc








@@ -9767,7 +9767,6 @@ F:	Documentation/networking/device_drivers/ethernet/huawei/hinic.rst







F:	drivers/net/ethernet/huawei/hinic/

















HUGETLB SUBSYSTEM









M:	Mike Kravetz <mike.kravetz@oracle.com>









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









L:	linux-mm@kvack.org









S:	Maintained








@@ -9791,8 +9790,8 @@ T:	git git://linuxtv.org/media_tree.git







F:	drivers/media/platform/st/sti/hva

















HWPOISON MEMORY FAILURE HANDLING









M:	Naoya Horiguchi <naoya.horiguchi@nec.com>









R:	Miaohe Lin <linmiaohe@huawei.com>









M:	Miaohe Lin <linmiaohe@huawei.com>









R:	Naoya Horiguchi <naoya.horiguchi@nec.com>









L:	linux-mm@kvack.org









S:	Maintained









F:	mm/hwpoison-inject.c








@@ -23215,9 +23214,8 @@ F:	drivers/misc/vmw_vmci/







F:	include/linux/vmw_vmci*

















VMWARE VMMOUSE SUBDRIVER









M:	Zack Rusin <zackr@vmware.com>









R:	VMware Graphics Reviewers <linux-graphics-maintainer@vmware.com>









R:	VMware PV-Drivers Reviewers <pv-drivers@vmware.com>









M:	Zack Rusin <zack.rusin@broadcom.com>









R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>









L:	linux-input@vger.kernel.org









S:	Supported









F:	drivers/input/mouse/vmmouse.c

























arch/arm64/mm/fault.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -607,6 +607,8 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr,







		goto done;









	}









	count_vm_vma_lock_event(VMA_LOCK_RETRY);









	if (fault & VM_FAULT_MAJOR)









		mm_flags |= FAULT_FLAG_TRIED;



















	/* Quick path to respond to signals */









	if (fault_signal_pending(fault, regs)) {
































arch/powerpc/mm/fault.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -497,6 +497,8 @@ static int ___do_page_fault(struct pt_regs *regs, unsigned long address,







		goto done;









	}









	count_vm_vma_lock_event(VMA_LOCK_RETRY);









	if (fault & VM_FAULT_MAJOR)









		flags |= FAULT_FLAG_TRIED;



















	if (fault_signal_pending(fault, regs))









		return user_mode(regs) ? 0 : SIGBUS;