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

Commit 584f1ada authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (fixes from Andrew Morton) 

Merge misc fixes from Andrew Morton:
 "10 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  fs/notify: don't show f_handle if exportfs_encode_inode_fh failed
  fsnotify/fdinfo: use named constants instead of hardcoded values
  kcmp: fix standard comparison bug
  mm/mmap.c: use pr_emerg when printing BUG related information
  shm: add memfd.h to UAPI export list
  checkpatch: allow commit descriptions on separate line from commit id
  sh: get_user_pages_fast() must flush cache
  eventpoll: fix uninitialized variable in epoll_ctl
  kernel/printk/printk.c: fix faulty logic in the case of recursive printk
  mem-hotplug: let memblock skip the hotpluggable memory regions in __next_mem_range()
parents 7ec62d42 7e882481

arch/sh/mm/gup.c

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr, 
		VM_BUG_ON(!pfn_valid(pte_pfn(pte)));

		page = pte_page(pte);

		get_page(page);

		__flush_anon_page(page, addr);

		flush_dcache_page(page);

		pages[*nr] = page;

		(*nr)++;

fs/eventpoll.c

+2 −1
Original line number Diff line number Diff line
@@ -1852,6 +1852,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, 
		goto error_tgt_fput;



	/* Check if EPOLLWAKEUP is allowed */

	if (ep_op_has_event(op))

		ep_take_care_of_epollwakeup(&epds);



	/*

fs/notify/fdinfo.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int show_mark_fhandle(struct seq_file *m, struct inode *inode) 
{

	struct {

		struct file_handle handle;

		u8 pad[64];

		u8 pad[MAX_HANDLE_SZ];

	} f;

	int size, ret, i;
@@ -50,7 +50,7 @@ static int show_mark_fhandle(struct seq_file *m, struct inode *inode) 
	size = f.handle.handle_bytes >> 2;



	ret = exportfs_encode_inode_fh(inode, (struct fid *)f.handle.f_handle, &size, 0);

	if ((ret == 255) || (ret == -ENOSPC)) {

	if ((ret == FILEID_INVALID) || (ret < 0)) {

		WARN_ONCE(1, "Can't encode file handler for inotify: %d\n", ret);

		return 0;

	}

include/uapi/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ header-y += matroxfb.h 
header-y += mdio.h

header-y += media.h

header-y += mei.h

header-y += memfd.h

header-y += mempolicy.h

header-y += meye.h

header-y += mic_common.h

kernel/kcmp.c

+4 −3
Original line number Diff line number Diff line
@@ -44,11 +44,12 @@ static long kptr_obfuscate(long v, int type) 
 */

static int kcmp_ptr(void *v1, void *v2, enum kcmp_type type)

{

	long ret;

	long t1, t2;



	ret = kptr_obfuscate((long)v1, type) - kptr_obfuscate((long)v2, type);

	t1 = kptr_obfuscate((long)v1, type);

	t2 = kptr_obfuscate((long)v2, type);



	return (ret < 0) | ((ret > 0) << 1);

	return (t1 < t2) | ((t1 > t2) << 1);

}



/* The caller must have pinned the task */