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

Commit 04b5da4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge fixes from Andrew Morton:
 "The nmi patch and watchdog patch aren't actually fixes - they're
  features which needed a few last-minutes touchups.

  Otherwise, a rather large batch of fixes - ocfs2 review takes a while
  and I got distracted and missed last week's batch"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (31 commits)
  ocfs2/dlm: do not purge lockres that is queued for assert master
  ocfs2: do not return DLM_MIGRATE_RESPONSE_MASTERY_REF to avoid endless,loop during umount
  ocfs2: manually do the iput once ocfs2_add_entry failed in ocfs2_symlink and ocfs2_mknod
  ocfs2: fix a tiny race when running dirop_fileop_racer
  ocfs2/dlm: fix misuse of list_move_tail() in dlm_run_purge_list()
  ocfs2: refcount: take rw_lock in ocfs2_reflink
  ocfs2: revert "ocfs2: fix NULL pointer dereference when dismount and ocfs2rec simultaneously"
  ocfs2: fix deadlock when two nodes are converting same lock from PR to EX and idletimeout closes conn
  ocfs2: should add inode into orphan dir after updating entry in ocfs2_rename()
  mm: fix crashes from mbind() merging vmas
  checkpatch: reduce false positives when checking void function return statements
  ia64: arch/ia64/include/uapi/asm/fcntl.h needs personality.h
  DMA, CMA: fix possible memory leak
  slab: fix oops when reading /proc/slab_allocators
  shmem: fix faulting into a hole while it's punched
  mm: let mm_find_pmd fix buggy race with THP fault
  mm: thp: fix DEBUG_PAGEALLOC oops in copy_page_rep()
  kernel/watchdog.c: print traces for all cpus on lockup detection
  nmi: provide the option to issue an NMI back trace to every cpu but current
  Documentation/accounting/getdelays.c: add missing null-terminate after strncpy call
  ...
parents a497c3ba ac4fef4d

CREDITS

+4 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,10 @@ 
			Linus

			Linus

----------

----------





M: Matt Mackal

E: mpm@selenic.com

D: SLOB slab allocator



N: Matti Aarnio

N: Matti Aarnio

E: mea@nic.funet.fi

E: mea@nic.funet.fi

D: Alpha systems hacking, IPv6 and other network related stuff

D: Alpha systems hacking, IPv6 and other network related stuff

Documentation/accounting/getdelays.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -314,6 +314,7 @@ int main(int argc, char *argv[]) 
			break;

			break;

		case 'm':

		case 'm':

			strncpy(cpumask, optarg, sizeof(cpumask));

			strncpy(cpumask, optarg, sizeof(cpumask));

			cpumask[sizeof(cpumask) - 1] = '\0';

			maskset = 1;

			maskset = 1;

			printf("cpumask %s maskset %d\n", cpumask, maskset);

			printf("cpumask %s maskset %d\n", cpumask, maskset);

			break;

			break;

Documentation/kernel-parameters.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -3130,6 +3130,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			[KNL] Should the soft-lockup detector generate panics.

			[KNL] Should the soft-lockup detector generate panics.

			Format: <integer>

			Format: <integer>





	softlockup_all_cpu_backtrace=

			[KNL] Should the soft-lockup detector generate

			backtraces on all cpus.

			Format: <integer>



	sonypi.*=	[HW] Sony Programmable I/O Control Device driver

	sonypi.*=	[HW] Sony Programmable I/O Control Device driver

			See Documentation/laptops/sonypi.txt

			See Documentation/laptops/sonypi.txt

Documentation/memory-hotplug.txt

+6 −9
Original line number Original line Diff line number Diff line
@@ -209,15 +209,12 @@ If memory device is found, memory hotplug code will be called. 




4.2 Notify memory hot-add event by hand

4.2 Notify memory hot-add event by hand

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

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

On powerpc, the firmware does not notify a memory hotplug event to the kernel.

On some architectures, the firmware may not notify the kernel of a memory

Therefore, "probe" interface is supported to notify the event to the kernel.

hotplug event.  Therefore, the memory "probe" interface is supported to

This interface depends on CONFIG_ARCH_MEMORY_PROBE.

explicitly notify the kernel.  This interface depends on



CONFIG_ARCH_MEMORY_PROBE and can be configured on powerpc, sh, and x86

CONFIG_ARCH_MEMORY_PROBE is supported on powerpc only. On x86, this config

if hotplug is supported, although for x86 this should be handled by ACPI

option is disabled by default since ACPI notifies a memory hotplug event to

notification.

the kernel, which performs its hotplug operation as the result. Please

enable this option if you need the "probe" interface for testing purposes

on x86.





Probe interface is located at

Probe interface is located at

/sys/devices/system/memory/probe

/sys/devices/system/memory/probe

Documentation/sysctl/kernel.txt

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

- shmall

- shmmax                      [ sysv ipc ]

- shmmax                      [ sysv ipc ]

- shmmni

- shmmni

- softlockup_all_cpu_backtrace

- stop-a                      [ SPARC only ]

- stop-a                      [ SPARC only ]

- sysrq                       ==> Documentation/sysrq.txt

- sysrq                       ==> Documentation/sysrq.txt

- sysctl_writes_strict

- sysctl_writes_strict
@@ -783,6 +784,22 @@ via the /proc/sys interface: 




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

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





softlockup_all_cpu_backtrace:



This value controls the soft lockup detector thread's behavior

when a soft lockup condition is detected as to whether or not

to gather further debug information. If enabled, each cpu will

be issued an NMI and instructed to capture stack trace.



This feature is only applicable for architectures which support

NMI.



0: do nothing. This is the default behavior.



1: on detection capture more debug information.



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



tainted:

tainted:





Non-zero if the kernel has been tainted.  Numeric values, which

Non-zero if the kernel has been tainted.  Numeric values, which