Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "31 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (31 commits)
  ocfs2: fix potential use after free
  mm/khugepaged: fix the xas_create_range() error path
  mm/khugepaged: collapse_shmem() do not crash on Compound
  mm/khugepaged: collapse_shmem() without freezing new_page
  mm/khugepaged: minor reorderings in collapse_shmem()
  mm/khugepaged: collapse_shmem() remember to clear holes
  mm/khugepaged: fix crashes due to misaccounted holes
  mm/khugepaged: collapse_shmem() stop if punched or truncated
  mm/huge_memory: fix lockdep complaint on 32-bit i_size_read()
  mm/huge_memory: splitting set mapping+index before unfreeze
  mm/huge_memory: rename freeze_page() to unmap_page()
  initramfs: clean old path before creating a hardlink
  kernel/kcov.c: mark funcs in __sanitizer_cov_trace_pc() as notrace
  psi: make disabling/enabling easier for vendor kernels
  proc: fixup map_files test on arm
  debugobjects: avoid recursive calls with kmemleak
  userfaultfd: shmem: UFFDIO_COPY: set the page dirty if VM_WRITE is not set
  userfaultfd: shmem: add i_size checks
  userfaultfd: shmem/hugetlbfs: only allow to register VM_MAYWRITE vmas
  userfaultfd: shmem: allocate anonymous memory for MAP_PRIVATE shmem
  ...
parents 6c7954b7 164f7e58

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -3505,6 +3505,10 @@ 
			before loading.

			See Documentation/blockdev/ramdisk.txt.



	psi=		[KNL] Enable or disable pressure stall information

			tracking.

			Format: <bool>



	psmouse.proto=	[HW,MOUSE] Highest PS2 mouse protocol extension to

			probe for; one of (bare|imps|exps|lifebook|any).

	psmouse.rate=	[HW,MOUSE] Set desired mouse report rate, in reports

MAINTAINERS

+7 −6
Original line number Diff line number Diff line
@@ -2491,7 +2491,7 @@ F: drivers/net/wireless/ath/* 
ATHEROS ATH5K WIRELESS DRIVER

M:	Jiri Slaby <jirislaby@gmail.com>

M:	Nick Kossifidis <mickflemm@gmail.com>

M:	"Luis R. Rodriguez" <mcgrof@do-not-panic.com>

M:	Luis Chamberlain <mcgrof@kernel.org>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/ath5k

S:	Maintained
@@ -5835,7 +5835,7 @@ F: include/uapi/linux/firewire*.h 
F:	tools/firewire/



FIRMWARE LOADER (request_firmware)

M:	Luis R. Rodriguez <mcgrof@kernel.org>

M:	Luis Chamberlain <mcgrof@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	Documentation/firmware_class/
@@ -8135,7 +8135,7 @@ F: tools/testing/selftests/ 
F:	Documentation/dev-tools/kselftest*



KERNEL USERMODE HELPER

M:	"Luis R. Rodriguez" <mcgrof@kernel.org>

M:	Luis Chamberlain <mcgrof@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	kernel/umh.c
@@ -8311,7 +8311,7 @@ F: mm/kmemleak.c 
F:	mm/kmemleak-test.c



KMOD KERNEL MODULE LOADER - USERMODE HELPER

M:	"Luis R. Rodriguez" <mcgrof@kernel.org>

M:	Luis Chamberlain <mcgrof@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	kernel/kmod.c
@@ -12061,7 +12061,7 @@ F: kernel/printk/ 
F:	include/linux/printk.h



PRISM54 WIRELESS DRIVER

M:	"Luis R. Rodriguez" <mcgrof@gmail.com>

M:	Luis Chamberlain <mcgrof@kernel.org>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/p54

S:	Obsolete
@@ -12075,9 +12075,10 @@ S: Maintained 
F:	fs/proc/

F:	include/linux/proc_fs.h

F:	tools/testing/selftests/proc/

F:	Documentation/filesystems/proc.txt



PROC SYSCTL

M:	"Luis R. Rodriguez" <mcgrof@kernel.org>

M:	Luis Chamberlain <mcgrof@kernel.org>

M:	Kees Cook <keescook@chromium.org>

L:	linux-kernel@vger.kernel.org

L:	linux-fsdevel@vger.kernel.org

fs/hfs/btree.c

+2 −1
Original line number Diff line number Diff line
@@ -338,13 +338,14 @@ void hfs_bmap_free(struct hfs_bnode *node) 


		nidx -= len * 8;

		i = node->next;

		hfs_bnode_put(node);

		if (!i) {

			/* panic */;

			pr_crit("unable to free bnode %u. bmap not found!\n",

				node->this);

			hfs_bnode_put(node);

			return;

		}

		hfs_bnode_put(node);

		node = hfs_bnode_find(tree, i);

		if (IS_ERR(node))

			return;

fs/hfsplus/btree.c

+2 −1
Original line number Diff line number Diff line
@@ -466,14 +466,15 @@ void hfs_bmap_free(struct hfs_bnode *node) 


		nidx -= len * 8;

		i = node->next;

		hfs_bnode_put(node);

		if (!i) {

			/* panic */;

			pr_crit("unable to free bnode %u. "

					"bmap not found!\n",

				node->this);

			hfs_bnode_put(node);

			return;

		}

		hfs_bnode_put(node);

		node = hfs_bnode_find(tree, i);

		if (IS_ERR(node))

			return;

fs/ocfs2/export.c

+1 −1
Original line number Diff line number Diff line
@@ -125,10 +125,10 @@ static struct dentry *ocfs2_get_dentry(struct super_block *sb, 


check_gen:

	if (handle->ih_generation != inode->i_generation) {

		iput(inode);

		trace_ocfs2_get_dentry_generation((unsigned long long)blkno,

						  handle->ih_generation,

						  inode->i_generation);

		iput(inode);

		result = ERR_PTR(-ESTALE);

		goto bail;

	}