Commit 5994eabf authored by Andrew Morton's avatar Andrew Morton
Browse files

merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes

parents e45a2e94 6867c7a3

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12474,6 +12474,7 @@ F: net/mctp/ 








MAPLE TREE









M:	Liam R. Howlett <Liam.Howlett@oracle.com>









L:	maple-tree@lists.infradead.org









L:	linux-mm@kvack.org









S:	Supported









F:	Documentation/core-api/maple_tree.rst
































arch/powerpc/mm/book3s64/subpage_prot.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -145,6 +145,7 @@ static int subpage_walk_pmd_entry(pmd_t *pmd, unsigned long addr,

















static const struct mm_walk_ops subpage_walk_ops = {









	.pmd_entry	= subpage_walk_pmd_entry,









	.walk_lock	= PGWALK_WRLOCK_VERIFY,









};



















static void subpage_mark_vma_nohuge(struct mm_struct *mm, unsigned long addr,
































arch/riscv/mm/pageattr.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -102,6 +102,7 @@ static const struct mm_walk_ops pageattr_ops = {







	.pmd_entry = pageattr_pmd_entry,









	.pte_entry = pageattr_pte_entry,









	.pte_hole = pageattr_pte_hole,









	.walk_lock = PGWALK_RDLOCK,









};



















static int __set_memory(unsigned long addr, int numpages, pgprot_t set_mask,
































arch/s390/mm/gmap.c



+5
−0






























Original line number
Diff line number
Diff line







@@ -2514,6 +2514,7 @@ static int thp_split_walk_pmd_entry(pmd_t *pmd, unsigned long addr,

















static const struct mm_walk_ops thp_split_walk_ops = {









	.pmd_entry	= thp_split_walk_pmd_entry,









	.walk_lock	= PGWALK_WRLOCK_VERIFY,









};



















static inline void thp_split_mm(struct mm_struct *mm)








@@ -2565,6 +2566,7 @@ static int __zap_zero_pages(pmd_t *pmd, unsigned long start,

















static const struct mm_walk_ops zap_zero_walk_ops = {









	.pmd_entry	= __zap_zero_pages,









	.walk_lock	= PGWALK_WRLOCK,









};



















/*








@@ -2655,6 +2657,7 @@ static const struct mm_walk_ops enable_skey_walk_ops = {







	.hugetlb_entry		= __s390_enable_skey_hugetlb,









	.pte_entry		= __s390_enable_skey_pte,









	.pmd_entry		= __s390_enable_skey_pmd,









	.walk_lock		= PGWALK_WRLOCK,









};



















int s390_enable_skey(void)








@@ -2692,6 +2695,7 @@ static int __s390_reset_cmma(pte_t *pte, unsigned long addr,

















static const struct mm_walk_ops reset_cmma_walk_ops = {









	.pte_entry		= __s390_reset_cmma,









	.walk_lock		= PGWALK_WRLOCK,









};



















void s390_reset_cmma(struct mm_struct *mm)








@@ -2728,6 +2732,7 @@ static int s390_gather_pages(pte_t *ptep, unsigned long addr,

















static const struct mm_walk_ops gather_pages_ops = {









	.pte_entry = s390_gather_pages,









	.walk_lock = PGWALK_RDLOCK,









};



















/*
































fs/nilfs2/inode.c



+8
−0






























Original line number
Diff line number
Diff line







@@ -1101,9 +1101,17 @@ int nilfs_set_file_dirty(struct inode *inode, unsigned int nr_dirty)

















int __nilfs_mark_inode_dirty(struct inode *inode, int flags)









{









	struct the_nilfs *nilfs = inode->i_sb->s_fs_info;









	struct buffer_head *ibh;









	int err;



















	/*









	 * Do not dirty inodes after the log writer has been detached









	 * and its nilfs_root struct has been freed.









	 */









	if (unlikely(nilfs_purging(nilfs)))









		return 0;



















	err = nilfs_load_inode_block(inode, &ibh);









	if (unlikely(err)) {









		nilfs_warn(inode->i_sb,