Commit 0b1dcc2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2022-11-24' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm 

Pull hotfixes from Andrew Morton:
 "24 MM and non-MM hotfixes. 8 marked cc:stable and 16 for post-6.0
  issues.

  There have been a lot of hotfixes this cycle, and this is quite a
  large batch given how far we are into the -rc cycle. Presumably a
  reflection of the unusually large amount of MM material which went
  into 6.1-rc1"

* tag 'mm-hotfixes-stable-2022-11-24' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (24 commits)
  test_kprobes: fix implicit declaration error of test_kprobes
  nilfs2: fix nilfs_sufile_mark_dirty() not set segment usage as dirty
  mm/cgroup/reclaim: fix dirty pages throttling on cgroup v1
  mm: fix unexpected changes to {failslab|fail_page_alloc}.attr
  swapfile: fix soft lockup in scan_swap_map_slots
  hugetlb: fix __prep_compound_gigantic_page page flag setting
  kfence: fix stack trace pruning
  proc/meminfo: fix spacing in SecPageTables
  mm: multi-gen LRU: retry folios written back while isolated
  mailmap: update email address for Satya Priya
  mm/migrate_device: return number of migrating pages in args->cpages
  kbuild: fix -Wimplicit-function-declaration in license_is_gpl_compatible
  MAINTAINERS: update Alex Hung's email address
  mailmap: update Alex Hung's email address
  mm: mmap: fix documentation for vma_mas_szero
  mm/damon/sysfs-schemes: skip stats update if the scheme directory is removed
  mm/memory: return vm_fault_t result from migrate_to_ram() callback
  mm: correctly charge compressed memory to its memcg
  ipc/shm: call underlying open/close vm_ops
  gcov: clang: fix the buffer overflow issue
  ...
parents b3085709 de3db3f8

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electr 
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>

Alexei Starovoitov <ast@kernel.org> <ast@fb.com>

Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>

Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>

Alex Shi <alexs@kernel.org> <alex.shi@intel.com>

Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>

Alex Shi <alexs@kernel.org> <alex.shi@linux.alibaba.com>
@@ -382,6 +383,7 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org> 
Santosh Shilimkar <ssantosh@kernel.org>

Sarangdhar Joshi <spjoshi@codeaurora.org>

Sascha Hauer <s.hauer@pengutronix.de>

Satya Priya <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>

S.Çağlar Onur <caglar@pardus.org.tr>

Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>

Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10287,7 +10287,7 @@ T: git https://github.com/intel/gvt-linux.git 
F:	drivers/gpu/drm/i915/gvt/









INTEL HID EVENT DRIVER









M:	Alex Hung <alex.hung@canonical.com>









M:	Alex Hung <alexhung@gmail.com>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained









F:	drivers/platform/x86/intel/hid.c
































fs/nilfs2/sufile.c



+8
−0






























Original line number
Diff line number
Diff line







@@ -495,14 +495,22 @@ void nilfs_sufile_do_free(struct inode *sufile, __u64 segnum,







int nilfs_sufile_mark_dirty(struct inode *sufile, __u64 segnum)









{









	struct buffer_head *bh;









	void *kaddr;









	struct nilfs_segment_usage *su;









	int ret;



















	down_write(&NILFS_MDT(sufile)->mi_sem);









	ret = nilfs_sufile_get_segment_usage_block(sufile, segnum, 0, &bh);









	if (!ret) {









		mark_buffer_dirty(bh);









		nilfs_mdt_mark_dirty(sufile);









		kaddr = kmap_atomic(bh->b_page);









		su = nilfs_sufile_block_get_segment_usage(sufile, segnum, bh, kaddr);









		nilfs_segment_usage_set_dirty(su);









		kunmap_atomic(kaddr);









		brelse(bh);









	}









	up_write(&NILFS_MDT(sufile)->mi_sem);









	return ret;









}










































include/linux/fault-inject.h



+5
−2






























Original line number
Diff line number
Diff line







@@ -20,7 +20,6 @@ struct fault_attr {







	atomic_t space;









	unsigned long verbose;









	bool task_filter;









	bool no_warn;









	unsigned long stacktrace_depth;









	unsigned long require_start;









	unsigned long require_end;








@@ -32,6 +31,10 @@ struct fault_attr {







	struct dentry *dname;









};



















enum fault_flags {









	FAULT_NOWARN =	1 << 0,









};



















#define FAULT_ATTR_INITIALIZER {					\









		.interval = 1,						\









		.times = ATOMIC_INIT(1),				\








@@ -40,11 +43,11 @@ struct fault_attr {







		.ratelimit_state = RATELIMIT_STATE_INIT_DISABLED,	\









		.verbose = 2,						\









		.dname = NULL,						\









		.no_warn = false,					\









	}



















#define DECLARE_FAULT_ATTR(name) struct fault_attr name = FAULT_ATTR_INITIALIZER









int setup_fault_attr(struct fault_attr *attr, char *str);









bool should_fail_ex(struct fault_attr *attr, ssize_t size, int flags);









bool should_fail(struct fault_attr *attr, ssize_t size);



















#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
































include/linux/license.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -2,6 +2,8 @@







#ifndef __LICENSE_H









#define __LICENSE_H



















#include <linux/string.h>



















static inline int license_is_gpl_compatible(const char *license)









{









	return (strcmp(license, "GPL") == 0