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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "9 patches.

  Subsystems affected by this patch series: mm (kfence, mempolicy,
  memory-failure, pagemap, pagealloc, damon, and memory-failure),
  core-kernel, and MAINTAINERS"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/hwpoison: clear MF_COUNT_INCREASED before retrying get_any_page()
  mm/damon/dbgfs: protect targets destructions with kdamond_lock
  mm/page_alloc: fix __alloc_size attribute for alloc_pages_exact_nid
  mm: delete unsafe BUG from page_cache_add_speculative()
  mm, hwpoison: fix condition in free hugetlb page path
  MAINTAINERS: mark more list instances as moderated
  kernel/crash_core: suppress unknown crashkernel parameter warning
  mm: mempolicy: fix THP allocations escaping mempolicy restrictions
  kfence: fix memory leak when cat kfence objects
parents b927dfc6 2a57d83c

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -14845,7 +14845,7 @@ PCIE DRIVER FOR MEDIATEK 
M:	Ryder Lee <ryder.lee@mediatek.com>

M:	Jianjun Wang <jianjun.wang@mediatek.com>

L:	linux-pci@vger.kernel.org

L:	linux-mediatek@lists.infradead.org

L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	Documentation/devicetree/bindings/pci/mediatek*

F:	drivers/pci/controller/*mediatek*
@@ -17423,7 +17423,7 @@ F: drivers/video/fbdev/sm712* 
SILVACO I3C DUAL-ROLE MASTER

M:	Miquel Raynal <miquel.raynal@bootlin.com>

M:	Conor Culhane <conor.culhane@silvaco.com>

L:	linux-i3c@lists.infradead.org

L:	linux-i3c@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml

F:	drivers/i3c/master/svc-i3c-master.c

include/linux/gfp.h

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ extern unsigned long get_zeroed_page(gfp_t gfp_mask); 


void *alloc_pages_exact(size_t size, gfp_t gfp_mask) __alloc_size(1);

void free_pages_exact(void *virt, size_t size);

__meminit void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) __alloc_size(1);

__meminit void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) __alloc_size(2);



#define __get_free_page(gfp_mask) \

		__get_free_pages((gfp_mask), 0)

include/linux/pagemap.h

+0 −1
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ static inline struct inode *folio_inode(struct folio *folio) 


static inline bool page_cache_add_speculative(struct page *page, int count)

{

	VM_BUG_ON_PAGE(PageTail(page), page);

	return folio_ref_try_add_rcu((struct folio *)page, count);

}

kernel/crash_core.c

+11 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include <linux/buildid.h>

#include <linux/crash_core.h>

#include <linux/init.h>

#include <linux/utsname.h>

#include <linux/vmalloc.h>
@@ -295,6 +296,16 @@ int __init parse_crashkernel_low(char *cmdline, 
				"crashkernel=", suffix_tbl[SUFFIX_LOW]);

}



/*

 * Add a dummy early_param handler to mark crashkernel= as a known command line

 * parameter and suppress incorrect warnings in init/main.c.

 */

static int __init parse_crashkernel_dummy(char *arg)

{

	return 0;

}

early_param("crashkernel", parse_crashkernel_dummy);



Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type,

			  void *data, size_t data_len)

{

mm/damon/dbgfs.c

+2 −0
Original line number Diff line number Diff line
@@ -650,10 +650,12 @@ static void dbgfs_before_terminate(struct damon_ctx *ctx) 
	if (!targetid_is_pid(ctx))

		return;



	mutex_lock(&ctx->kdamond_lock);

	damon_for_each_target_safe(t, next, ctx) {

		put_pid((struct pid *)t->id);

		damon_destroy_target(t);

	}

	mutex_unlock(&ctx->kdamond_lock);

}



static struct damon_ctx *dbgfs_new_ctx(void)