Commit 3b910105 authored Dec 09, 2022 by Andrew Morton

Merge branch 'mm-hotfixes-stable' into mm-stable

parents e0ff4280 4a7ba45b

.mailmap

+3 −0

Original line number	Diff line number	Diff line
		@@ -287,6 +287,7 @@ Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>
		Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>
		Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu>
		Matthieu CASTET <castet.matthieu@free.fr>
		Matti Vaittinen <mazziesaccount@gmail.com> <matti.vaittinen@fi.rohmeurope.com>
		Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
		Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
		Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
		@@ -372,6 +373,8 @@ Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
		Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
		Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
		Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
		Muchun Song <muchun.song@linux.dev> <songmuchun@bytedance.com>
		Muchun Song <muchun.song@linux.dev> <smuchun@gmail.com>
		Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
		Rudolf Marek <R.Marek@sh.cvut.cz>
		Rui Saraiva <rmps@joel.ist.utl.pt>

MAINTAINERS

+2 −2

Original line number	Diff line number	Diff line
		@@ -5299,7 +5299,7 @@ M: Johannes Weiner <hannes@cmpxchg.org>
		M: Michal Hocko <mhocko@kernel.org>
		M: Roman Gushchin <roman.gushchin@linux.dev>
		M: Shakeel Butt <shakeelb@google.com>
		R: Muchun Song <songmuchun@bytedance.com>
		R: Muchun Song <muchun.song@linux.dev>
		L: cgroups@vger.kernel.org
		L: linux-mm@kvack.org
		S: Maintained
		@@ -9443,7 +9443,7 @@ F: drivers/net/ethernet/huawei/hinic/

		HUGETLB SUBSYSTEM
		M: Mike Kravetz <mike.kravetz@oracle.com>
		M: Muchun Song <songmuchun@bytedance.com>
		M: Muchun Song <muchun.song@linux.dev>
		L: linux-mm@kvack.org
		S: Maintained
		F: Documentation/ABI/testing/sysfs-kernel-mm-hugepages

include/linux/cgroup.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ struct css_task_iter {
		struct list_head iters_node; /* css_set->task_iters */
		};

		extern struct file_system_type cgroup_fs_type;
		extern struct cgroup_root cgrp_dfl_root;
		extern struct css_set init_css_set;

include/linux/swapops.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -35,7 +35,9 @@
		#ifdef MAX_PHYSMEM_BITS
		#define SWP_PFN_BITS (MAX_PHYSMEM_BITS - PAGE_SHIFT)
		#else /* MAX_PHYSMEM_BITS */
		#define SWP_PFN_BITS (BITS_PER_LONG - PAGE_SHIFT)
		#define SWP_PFN_BITS min_t(int, \
		sizeof(phys_addr_t) * 8 - PAGE_SHIFT, \
		SWP_TYPE_SHIFT)
		#endif /* MAX_PHYSMEM_BITS */
		#define SWP_PFN_MASK (BIT(SWP_PFN_BITS) - 1)

kernel/cgroup/cgroup-internal.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -167,7 +167,6 @@ struct cgroup_mgctx {
		extern spinlock_t css_set_lock;
		extern struct cgroup_subsys *cgroup_subsys[];
		extern struct list_head cgroup_roots;
		extern struct file_system_type cgroup_fs_type;

		/* iterate across the hierarchies */
		#define for_each_root(root) \