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

Commit 094803e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Andrew's incoming) 

Quoth Andrew:

 - Most of MM.  Still waiting for the poweroc guys to get off their
   butts and review some threaded hugepages patches.

 - alpha

 - vfs bits

 - drivers/misc

 - a few core kerenl tweaks

 - printk() features

 - MAINTAINERS updates

 - backlight merge

 - leds merge

 - various lib/ updates

 - checkpatch updates

* akpm: (127 commits)
  epoll: fix spurious lockdep warnings
  checkpatch: add a --strict check for utf-8 in commit logs
  kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
  llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
  wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack
  fat: follow rename pack_hex_byte() to hex_byte_pack()
  security: follow rename pack_hex_byte() to hex_byte_pack()
  kgdb: follow rename pack_hex_byte() to hex_byte_pack()
  lib: rename pack_hex_byte() to hex_byte_pack()
  lib/string.c: fix strim() semantics for strings that have only blanks
  lib/idr.c: fix comment for ida_get_new_above()
  lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
  lib/bitmap.c: quiet sparse noise about address space
  lib/spinlock_debug.c: print owner on spinlock lockup
  lib/kstrtox: common code between kstrto*() and simple_strto*() functions
  drivers/leds/leds-lp5521.c: check if reset is successful
  leds: turn the blink_timer off before starting to blink
  leds: save the delay values after a successful call to blink_set()
  drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
  drivers/leds/leds-lm3530.c: add __devexit_p where needed
  ...
parents 32087d4e d8805e63

Documentation/kernel-parameters.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -973,6 +973,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	ignore_loglevel	[KNL]

	ignore_loglevel	[KNL]

			Ignore loglevel setting - this will print /all/

			Ignore loglevel setting - this will print /all/

			kernel messages to the console. Useful for debugging.

			kernel messages to the console. Useful for debugging.

			We also add it as printk module parameter, so users

			could change it dynamically, usually by

			/sys/module/printk/parameters/ignore_loglevel.





	ihash_entries=	[KNL]

	ihash_entries=	[KNL]

			Set number of hash buckets for inode cache.

			Set number of hash buckets for inode cache.
@@ -1666,6 +1669,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			debugging driver suspend/resume hooks).  This may

			debugging driver suspend/resume hooks).  This may

			not work reliably with all consoles, but is known

			not work reliably with all consoles, but is known

			to work with serial and VGA consoles.

			to work with serial and VGA consoles.

			To facilitate more flexible debugging, we also add

			console_suspend, a printk module parameter to control

			it. Users could use console_suspend (usually

			/sys/module/printk/parameters/console_suspend) to

			turn on/off it dynamically.





	noaliencache	[MM, NUMA, SLAB] Disables the allocation of alien

	noaliencache	[MM, NUMA, SLAB] Disables the allocation of alien

			caches in the slab allocator.  Saves per-node memory,

			caches in the slab allocator.  Saves per-node memory,

Documentation/sysctl/kernel.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ show up in /proc/sys/kernel: 
- bootloader_type	     [ X86 only ]

- bootloader_type	     [ X86 only ]

- bootloader_version	     [ X86 only ]

- bootloader_version	     [ X86 only ]

- callhome		     [ S390 only ]

- callhome		     [ S390 only ]

- cap_last_cap

- core_pattern

- core_pattern

- core_pipe_limit

- core_pipe_limit

- core_uses_pid

- core_uses_pid
@@ -155,6 +156,13 @@ on has a service contract with IBM. 




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

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





cap_last_cap



Highest valid capability of the running kernel.  Exports

CAP_LAST_CAP from the kernel.



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



core_pattern:

core_pattern:





core_pattern is used to specify a core dumpfile pattern name.

core_pattern is used to specify a core dumpfile pattern name.

Documentation/trace/postprocess/trace-vmscan-postprocess.pl

+4 −4
Original line number Original line Diff line number Diff line
@@ -379,10 +379,10 @@ EVENT_PROCESS: 




			# To closer match vmstat scanning statistics, only count isolate_both

			# To closer match vmstat scanning statistics, only count isolate_both

			# and isolate_inactive as scanning. isolate_active is rotation

			# and isolate_inactive as scanning. isolate_active is rotation

			# isolate_inactive == 0

			# isolate_inactive == 1

			# isolate_active   == 1

			# isolate_active   == 2

			# isolate_both     == 2

			# isolate_both     == 3

			if ($isolate_mode != 1) {

			if ($isolate_mode != 2) {

				$perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned;

				$perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned;

			}

			}

			$perprocesspid{$process_pid}->{HIGH_NR_CONTIG_DIRTY} += $nr_contig_dirty;

			$perprocesspid{$process_pid}->{HIGH_NR_CONTIG_DIRTY} += $nr_contig_dirty;

MAINTAINERS

+6 −1
Original line number Original line Diff line number Diff line
@@ -316,6 +316,10 @@ W: http://wiki.analog.com/AD7879 
S:	Supported

S:	Supported

F:	drivers/input/touchscreen/ad7879.c

F:	drivers/input/touchscreen/ad7879.c





ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR)

M:	Jiri Kosina <jkosina@suse.cz>

S:	Maintained



ADM1025 HARDWARE MONITOR DRIVER

ADM1025 HARDWARE MONITOR DRIVER

M:	Jean Delvare <khali@linux-fr.org>

M:	Jean Delvare <khali@linux-fr.org>

L:	lm-sensors@lm-sensors.org

L:	lm-sensors@lm-sensors.org
@@ -4020,6 +4024,7 @@ M: Eric Piel <eric.piel@tremplin-utc.net> 
S:	Maintained

S:	Maintained

F:	Documentation/misc-devices/lis3lv02d

F:	Documentation/misc-devices/lis3lv02d

F:	drivers/misc/lis3lv02d/

F:	drivers/misc/lis3lv02d/

F:	drivers/platform/x86/hp_accel.c





LLC (802.2)

LLC (802.2)

M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
@@ -4974,7 +4979,7 @@ F: include/linux/i2c-algo-pca.h 
F:	include/linux/i2c-pca-platform.h

F:	include/linux/i2c-pca-platform.h





PCI ERROR RECOVERY

PCI ERROR RECOVERY

M:	Linas Vepstas <linas@austin.ibm.com>

M:     Linas Vepstas <linasvepstas@gmail.com>

L:	linux-pci@vger.kernel.org

L:	linux-pci@vger.kernel.org

S:	Supported

S:	Supported

F:	Documentation/PCI/pci-error-recovery.txt

F:	Documentation/PCI/pci-error-recovery.txt

arch/alpha/include/asm/unistd.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -457,10 +457,12 @@ 
#define __NR_clock_adjtime		499

#define __NR_clock_adjtime		499

#define __NR_syncfs			500

#define __NR_syncfs			500

#define __NR_setns			501

#define __NR_setns			501

#define __NR_accept4			502

#define __NR_sendmmsg			503





#ifdef __KERNEL__

#ifdef __KERNEL__





#define NR_SYSCALLS			502

#define NR_SYSCALLS			504





#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_READDIR