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

Merge tag 'mm-hotfixes-stable-2024-10-09-15-46' of... 

Merge tag 'mm-hotfixes-stable-2024-10-09-15-46' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "12 hotfixes, 5 of which are c:stable. All singletons, about half of
  which are MM"

* tag 'mm-hotfixes-stable-2024-10-09-15-46' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mm: zswap: delete comments for "value" member of 'struct zswap_entry'.
  CREDITS: sort alphabetically by name
  secretmem: disable memfd_secret() if arch cannot set direct map
  .mailmap: update Fangrui's email
  mm/huge_memory: check pmd_special() only after pmd_present()
  resource, kunit: fix user-after-free in resource_test_region_intersects()
  fs/proc/kcore.c: allow translation of physical memory addresses
  selftests/mm: fix incorrect buffer->mirror size in hmm2 double_map test
  device-dax: correct pgoff align in dax_set_mapping()
  kthread: unpark only parked kthread
  Revert "mm: introduce PF_MEMALLOC_NORECLAIM, PF_MEMALLOC_NOWARN"
  bcachefs: do not use PF_MEMALLOC_NORECLAIM
parents b983b271 aa5f0fa6

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com> 
Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>

Fangrui Song <i@maskray.me> <maskray@google.com>

Felipe W Damasio <felipewd@terra.com.br>

Felix Kuhling <fxkuehl@gmx.de>

Felix Moeller <felix@derklecks.de>

CREDITS

+27 −27
Original line number Diff line number Diff line
@@ -1358,10 +1358,6 @@ D: Major kbuild rework during the 2.5 cycle 
D: ISDN Maintainer

S: USA



N: Gerrit Renker

E: gerrit@erg.abdn.ac.uk

D: DCCP protocol support.



N: Philip Gladstone

E: philip@gladstonefamily.net

D: Kernel / timekeeping stuff
@@ -1677,11 +1673,6 @@ W: http://www.carumba.com/ 
D: bug toaster (A1 sauce makes all the difference)

D: Random linux hacker



N: James Hogan

E: jhogan@kernel.org

D: Metag architecture maintainer

D: TZ1090 SoC maintainer



N: Tim Hockin

E: thockin@hockin.org

W: http://www.hockin.org/~thockin
@@ -1697,6 +1688,11 @@ D: hwmon subsystem maintainer 
D: i2c-sis96x and i2c-stub SMBus drivers

S: USA



N: James Hogan

E: jhogan@kernel.org

D: Metag architecture maintainer

D: TZ1090 SoC maintainer



N: Dirk Hohndel

E: hohndel@suse.de

D: The XFree86[tm] Project
@@ -1872,6 +1868,10 @@ S: K osmidomkum 723 
S: 160 00 Praha 6

S: Czech Republic



N: Seth Jennings

E: sjenning@redhat.com

D: Creation and maintenance of zswap



N: Jeremy Kerr

D: Maintainer of SPU File System
@@ -2188,19 +2188,6 @@ N: Mike Kravetz 
E: mike.kravetz@oracle.com

D: Maintenance and development of the hugetlb subsystem



N: Seth Jennings

E: sjenning@redhat.com

D: Creation and maintenance of zswap



N: Dan Streetman

E: ddstreet@ieee.org

D: Maintenance and development of zswap

D: Creation and maintenance of the zpool API



N: Vitaly Wool

E: vitaly.wool@konsulko.com

D: Maintenance and development of zswap



N: Andreas S. Krebs

E: akrebs@altavista.net

D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards
@@ -3191,6 +3178,11 @@ N: Ken Pizzini 
E: ken@halcyon.com

D: CDROM driver "sonycd535" (Sony CDU-535/531)



N: Mathieu Poirier

E: mathieu.poirier@linaro.org

D: CoreSight kernel subsystem, Maintainer 2014-2022

D: Perf tool support for CoreSight



N: Stelian Pop

E: stelian@popies.net

P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0  D3F7 7185 9E7A EDBB 6147
@@ -3300,6 +3292,10 @@ S: Schlossbergring 9 
S: 79098 Freiburg

S: Germany



N: Gerrit Renker

E: gerrit@erg.abdn.ac.uk

D: DCCP protocol support.



N: Thomas Renninger

E: trenn@suse.de

D: cpupowerutils
@@ -3576,11 +3572,6 @@ D: several improvements to system programs 
S: Oldenburg

S: Germany



N: Mathieu Poirier

E: mathieu.poirier@linaro.org

D: CoreSight kernel subsystem, Maintainer 2014-2022

D: Perf tool support for CoreSight



N: Robert Schwebel

E: robert@schwebel.de

W: https://www.schwebel.de
@@ -3771,6 +3762,11 @@ S: Chr. Winthersvej 1 B, st.th. 
S: DK-1860 Frederiksberg C

S: Denmark



N: Dan Streetman

E: ddstreet@ieee.org

D: Maintenance and development of zswap

D: Creation and maintenance of the zpool API



N: Drew Sullivan

E: drew@ss.org

W: http://www.ss.org/
@@ -4286,6 +4282,10 @@ S: Pipers Way 
S: Swindon. SN3 1RJ

S: England



N: Vitaly Wool

E: vitaly.wool@konsulko.com

D: Maintenance and development of zswap



N: Chris Wright

E: chrisw@sous-sol.org

D: hacking on LSM framework and security modules.

arch/s390/include/asm/io.h

+2 −0
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ 
#include <asm/pci_io.h>



#define xlate_dev_mem_ptr xlate_dev_mem_ptr

#define kc_xlate_dev_mem_ptr xlate_dev_mem_ptr

void *xlate_dev_mem_ptr(phys_addr_t phys);

#define unxlate_dev_mem_ptr unxlate_dev_mem_ptr

#define kc_unxlate_dev_mem_ptr unxlate_dev_mem_ptr

void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr);



#define IO_SPACE_LIMIT 0

drivers/dax/device.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static void dax_set_mapping(struct vm_fault *vmf, pfn_t pfn, 
		nr_pages = 1;



	pgoff = linear_page_index(vmf->vma,

			ALIGN(vmf->address, fault_size));

			ALIGN_DOWN(vmf->address, fault_size));



	for (i = 0; i < nr_pages; i++) {

		struct page *page = pfn_to_page(pfn_t_to_pfn(pfn) + i);

fs/bcachefs/fs.c

+6 −8
Original line number Diff line number Diff line
@@ -300,10 +300,10 @@ static struct inode *bch2_alloc_inode(struct super_block *sb) 
	BUG();

}



static struct bch_inode_info *__bch2_new_inode(struct bch_fs *c)

static struct bch_inode_info *__bch2_new_inode(struct bch_fs *c, gfp_t gfp)

{

	struct bch_inode_info *inode = alloc_inode_sb(c->vfs_sb,

						bch2_inode_cache, GFP_NOFS);

						bch2_inode_cache, gfp);

	if (!inode)

		return NULL;
@@ -315,7 +315,7 @@ static struct bch_inode_info *__bch2_new_inode(struct bch_fs *c) 
	mutex_init(&inode->ei_quota_lock);

	memset(&inode->ei_devs_need_flush, 0, sizeof(inode->ei_devs_need_flush));



	if (unlikely(inode_init_always(c->vfs_sb, &inode->v))) {

	if (unlikely(inode_init_always_gfp(c->vfs_sb, &inode->v, gfp))) {

		kmem_cache_free(bch2_inode_cache, inode);

		return NULL;

	}
@@ -328,12 +328,10 @@ static struct bch_inode_info *__bch2_new_inode(struct bch_fs *c) 
 */

static struct bch_inode_info *bch2_new_inode(struct btree_trans *trans)

{

	struct bch_inode_info *inode =

		memalloc_flags_do(PF_MEMALLOC_NORECLAIM|PF_MEMALLOC_NOWARN,

				  __bch2_new_inode(trans->c));

	struct bch_inode_info *inode = __bch2_new_inode(trans->c, GFP_NOWAIT);



	if (unlikely(!inode)) {

		int ret = drop_locks_do(trans, (inode = __bch2_new_inode(trans->c)) ? 0 : -ENOMEM);

		int ret = drop_locks_do(trans, (inode = __bch2_new_inode(trans->c, GFP_NOFS)) ? 0 : -ENOMEM);

		if (ret && inode) {

			__destroy_inode(&inode->v);

			kmem_cache_free(bch2_inode_cache, inode);
@@ -407,7 +405,7 @@ __bch2_create(struct mnt_idmap *idmap, 
	if (ret)

		return ERR_PTR(ret);

#endif

	inode = __bch2_new_inode(c);

	inode = __bch2_new_inode(c, GFP_NOFS);

	if (unlikely(!inode)) {

		inode = ERR_PTR(-ENOMEM);

		goto err;