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

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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "16 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/memblock.c: fix a typo in __next_mem_pfn_range() comments
  mm, page_alloc: check for max order in hot path
  scripts/spdxcheck.py: make python3 compliant
  tmpfs: make lseek(SEEK_DATA/SEK_HOLE) return ENXIO with a negative offset
  lib/ubsan.c: don't mark __ubsan_handle_builtin_unreachable as noreturn
  mm/vmstat.c: fix NUMA statistics updates
  mm/gup.c: fix follow_page_mask() kerneldoc comment
  ocfs2: free up write context when direct IO failed
  scripts/faddr2line: fix location of start_kernel in comment
  mm: don't reclaim inodes with many attached pages
  mm, memory_hotplug: check zone_movable in has_unmovable_pages
  mm/swapfile.c: use kvzalloc for swap_info_struct allocation
  MAINTAINERS: update OMAP MMC entry
  hugetlbfs: fix kernel BUG at fs/hugetlbfs/inode.c:444!
  kernel/sched/psi.c: simplify cgroup_move_task()
  z3fold: fix possible reclaim races
parents 03582f33 45e79815

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -2138,6 +2138,10 @@ E: paul@laufernet.com 
D: Soundblaster driver fixes, ISAPnP quirk

S: California, USA



N: Jarkko Lavinen

E: jarkko.lavinen@nokia.com

D: OMAP MMC support



N: Jonathan Layes

D: ARPD support

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -10808,9 +10808,9 @@ F: drivers/media/platform/omap3isp/ 
F:	drivers/staging/media/omap4iss/



OMAP MMC SUPPORT

M:	Jarkko Lavinen <jarkko.lavinen@nokia.com>

M:	Aaro Koskinen <aaro.koskinen@iki.fi>

L:	linux-omap@vger.kernel.org

S:	Maintained

S:	Odd Fixes

F:	drivers/mmc/host/omap.c



OMAP POWER MANAGEMENT SUPPORT

fs/inode.c

+5 −2
Original line number Diff line number Diff line
@@ -730,8 +730,11 @@ static enum lru_status inode_lru_isolate(struct list_head *item, 
		return LRU_REMOVED;

	}



	/* recently referenced inodes get one more pass */

	if (inode->i_state & I_REFERENCED) {

	/*

	 * Recently referenced inodes and inodes with many attached pages

	 * get one more pass.

	 */

	if (inode->i_state & I_REFERENCED || inode->i_data.nrpages > 1) {

		inode->i_state &= ~I_REFERENCED;

		spin_unlock(&inode->i_lock);

		return LRU_ROTATE;

fs/ocfs2/aops.c

+10 −2
Original line number Diff line number Diff line
@@ -2411,8 +2411,16 @@ static int ocfs2_dio_end_io(struct kiocb *iocb, 
	/* this io's submitter should not have unlocked this before we could */

	BUG_ON(!ocfs2_iocb_is_rw_locked(iocb));



	if (bytes > 0 && private)

		ret = ocfs2_dio_end_io_write(inode, private, offset, bytes);

	if (bytes <= 0)

		mlog_ratelimited(ML_ERROR, "Direct IO failed, bytes = %lld",

				 (long long)bytes);

	if (private) {

		if (bytes > 0)

			ret = ocfs2_dio_end_io_write(inode, private, offset,

						     bytes);

		else

			ocfs2_dio_free_write_ctx(inode, private);

	}



	ocfs2_iocb_clear_rw_locked(iocb);

fs/ocfs2/cluster/masklog.h

+9 −0
Original line number Diff line number Diff line
@@ -178,6 +178,15 @@ do { \ 
			      ##__VA_ARGS__);				\

} while (0)



#define mlog_ratelimited(mask, fmt, ...)				\

do {									\

	static DEFINE_RATELIMIT_STATE(_rs,				\

				      DEFAULT_RATELIMIT_INTERVAL,	\

				      DEFAULT_RATELIMIT_BURST);		\

	if (__ratelimit(&_rs))						\

		mlog(mask, fmt, ##__VA_ARGS__);				\

} while (0)



#define mlog_errno(st) ({						\

	int _st = (st);							\

	if (_st != -ERESTARTSYS && _st != -EINTR &&			\