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

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

Merge branch 'akpm' (patches from Andrew) 

Merge more updates from Andrew Morton:

 - procfs updates

 - various misc bits

 - lib/ updates

 - epoll updates

 - autofs

 - fatfs

 - a few more MM bits

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (58 commits)
  mm/page_io.c: fix polled swap page in
  checkpatch: add Co-developed-by to signature tags
  docs: fix Co-Developed-by docs
  drivers/base/platform.c: kmemleak ignore a known leak
  fs: don't open code lru_to_page()
  fs/: remove caller signal_pending branch predictions
  mm/: remove caller signal_pending branch predictions
  arch/arc/mm/fault.c: remove caller signal_pending_branch predictions
  kernel/sched/: remove caller signal_pending branch predictions
  kernel/locking/mutex.c: remove caller signal_pending branch predictions
  mm: select HAVE_MOVE_PMD on x86 for faster mremap
  mm: speed up mremap by 20x on large regions
  mm: treewide: remove unused address argument from pte_alloc functions
  initramfs: cleanup incomplete rootfs
  scripts/gdb: fix lx-version string output
  kernel/kcov.c: mark write_comp_data() as notrace
  kernel/sysctl: add panic_print into sysctl
  panic: add options to print system info when panic happens
  bfs: extra sanity checking and static inode bitmap
  exec: separate MM_ANONPAGES and RLIMIT_STACK accounting
  ...
parents 3fed6ae4 b685a735

Documentation/admin-guide/kernel-parameters.txt

+8 −0
Original line number Diff line number Diff line
@@ -3092,6 +3092,14 @@ 
			timeout < 0: reboot immediately

			Format: <timeout>



	panic_print=	Bitmask for printing system info when panic happens.

			User can chose combination of the following bits:

			bit 0: print all tasks info

			bit 1: print system memory info

			bit 2: print timer info

			bit 3: print locks info if CONFIG_LOCKDEP is on

			bit 4: print ftrace buffer



	panic_on_warn	panic() instead of WARN().  Useful to cause kdump

			on a WARN().

Documentation/process/coding-style.rst

+3 −0
Original line number Diff line number Diff line
@@ -443,6 +443,9 @@ In function prototypes, include parameter names with their data types. 
Although this is not required by the C language, it is preferred in Linux

because it is a simple way to add valuable information for the reader.



Do not use the `extern' keyword with function prototypes as this makes

lines longer and isn't strictly necessary.





7) Centralized exiting of functions

-----------------------------------

Documentation/process/submitting-patches.rst

+2 −2
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ tracking your trees, and to people trying to troubleshoot bugs in your 
tree.





12) When to use Acked-by:, Cc:, and Co-Developed-by:

12) When to use Acked-by:, Cc:, and Co-developed-by:

-------------------------------------------------------



The Signed-off-by: tag indicates that the signer was involved in the
@@ -543,7 +543,7 @@ person it names - but it should indicate that this person was copied on the 
patch.  This tag documents that potentially interested parties

have been included in the discussion.



A Co-Developed-by: states that the patch was also created by another developer

A Co-developed-by: states that the patch was also created by another developer

along with the original author.  This is useful at times when multiple people

work on a single patch.  Note, this person also needs to have a Signed-off-by:

line in the patch as well.

Documentation/sysctl/kernel.txt

+17 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ show up in /proc/sys/kernel: 
- panic_on_stackoverflow

- panic_on_unrecovered_nmi

- panic_on_warn

- panic_print

- panic_on_rcu_stall

- perf_cpu_time_max_percent

- perf_event_paranoid
@@ -654,6 +655,22 @@ a kernel rebuild when attempting to kdump at the location of a WARN(). 


==============================================================



panic_print:



Bitmask for printing system info when panic happens. User can chose

combination of the following bits:



bit 0: print all tasks info

bit 1: print system memory info

bit 2: print timer info

bit 3: print locks info if CONFIG_LOCKDEP is on

bit 4: print ftrace buffer



So for example to print tasks and memory info on panic, user can:

  echo 3 > /proc/sys/kernel/panic_print



==============================================================



panic_on_rcu_stall:



When set to 1, calls panic() after RCU stall detection messages. This

arch/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -535,6 +535,11 @@ config HAVE_IRQ_TIME_ACCOUNTING 
	  Archs need to ensure they use a high enough resolution clock to

	  support irq time accounting and then call enable_sched_clock_irqtime().



config HAVE_MOVE_PMD

	bool

	help

	  Archs that select this are able to move page tables at the PMD level.



config HAVE_ARCH_TRANSPARENT_HUGEPAGE

	bool