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

Commit 5cbb3d21 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge first patch-bomb from Andrew Morton:
 "Quite a lot of other stuff is banked up awaiting further
  next->mainline merging, but this batch contains:

   - Lots of random misc patches
   - OCFS2
   - Most of MM
   - backlight updates
   - lib/ updates
   - printk updates
   - checkpatch updates
   - epoll tweaking
   - rtc updates
   - hfs
   - hfsplus
   - documentation
   - procfs
   - update gcov to gcc-4.7 format
   - IPC"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (269 commits)
  ipc, msg: fix message length check for negative values
  ipc/util.c: remove unnecessary work pending test
  devpts: plug the memory leak in kill_sb
  ./Makefile: export initial ramdisk compression config option
  init/Kconfig: add option to disable kernel compression
  drivers: w1: make w1_slave::flags long to avoid memory corruption
  drivers/w1/masters/ds1wm.cuse dev_get_platdata()
  drivers/memstick/core/ms_block.c: fix unreachable state in h_msb_read_page()
  drivers/memstick/core/mspro_block.c: fix attributes array allocation
  drivers/pps/clients/pps-gpio.c: remove redundant of_match_ptr
  kernel/panic.c: reduce 1 byte usage for print tainted buffer
  gcov: reuse kbasename helper
  kernel/gcov/fs.c: use pr_warn()
  kernel/module.c: use pr_foo()
  gcov: compile specific gcov implementation based on gcc version
  gcov: add support for gcc 4.7 gcov format
  gcov: move gcov structs definitions to a gcc version specific file
  kernel/taskstats.c: return -ENOMEM when alloc memory fails in add_del_listener()
  kernel/taskstats.c: add nla_nest_cancel() for failure processing between nla_nest_start() and nla_nest_end()
  kernel/sysctl_binary.c: use scnprintf() instead of snprintf()
  ...
parents 9bc9ccd7 4e9b45a1

CREDITS

+6 −1
Original line number Diff line number Diff line
@@ -2576,7 +2576,7 @@ S: Toronto, Ontario 
S: Canada



N: Zwane Mwaikambo

E: zwane@arm.linux.org.uk

E: zwanem@gmail.com

D: Various driver hacking

D: Lowlevel x86 kernel hacking

D: General debugging
@@ -2895,6 +2895,11 @@ S: Framewood Road 
S: Wexham SL3 6PJ

S: United Kingdom



N: Richard Purdie

E: rpurdie@rpsys.net

D: Backlight subsystem maintainer

S: United Kingdom



N: Daniel Quinlan

E: quinlan@pathname.com

W: http://www.pathname.com/~quinlan/

Documentation/ABI/README

+13 −0
Original line number Diff line number Diff line
@@ -72,3 +72,16 @@ kernel tree without going through the obsolete state first. 


It's up to the developer to place their interfaces in the category they

wish for it to start out in.





Notable bits of non-ABI, which should not under any circumstances be considered

stable:



- Kconfig.  Userspace should not rely on the presence or absence of any

  particular Kconfig symbol, in /proc/config.gz, in the copy of .config

  commonly installed to /boot, or in any invocation of the kernel build

  process.



- Kernel-internal symbols.  Do not rely on the presence, absence, location, or

  type of any kernel symbol, either in System.map files or the kernel binary

  itself.  See Documentation/stable_api_nonsense.txt.

Documentation/backlight/lp855x-driver.txt

+3 −2
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ Kernel driver lp855x 
Backlight driver for LP855x ICs



Supported chips:

	Texas Instruments LP8550, LP8551, LP8552, LP8553, LP8556 and LP8557

	Texas Instruments LP8550, LP8551, LP8552, LP8553, LP8555, LP8556 and

	LP8557



Author: Milo(Woogyom) Kim <milo.kim@ti.com>
@@ -24,7 +25,7 @@ Value : pwm based or register based 


2) chip_id

The lp855x chip id.

Value : lp8550/lp8551/lp8552/lp8553/lp8556/lp8557

Value : lp8550/lp8551/lp8552/lp8553/lp8555/lp8556/lp8557



Platform data for lp855x

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

Documentation/cgroups/memory.txt

+7 −3
Original line number Diff line number Diff line
@@ -573,15 +573,19 @@ an memcg since the pages are allowed to be allocated from any physical 
node.  One of the use cases is evaluating application performance by

combining this information with the application's CPU allocation.



We export "total", "file", "anon" and "unevictable" pages per-node for

each memcg.  The ouput format of memory.numa_stat is:

Each memcg's numa_stat file includes "total", "file", "anon" and "unevictable"

per-node page counts including "hierarchical_<counter>" which sums up all

hierarchical children's values in addition to the memcg's own value.



The ouput format of memory.numa_stat is:



total=<total pages> N0=<node 0 pages> N1=<node 1 pages> ...

file=<total file pages> N0=<node 0 pages> N1=<node 1 pages> ...

anon=<total anon pages> N0=<node 0 pages> N1=<node 1 pages> ...

unevictable=<total anon pages> N0=<node 0 pages> N1=<node 1 pages> ...

hierarchical_<counter>=<counter pages> N0=<node 0 pages> N1=<node 1 pages> ...



And we have total = file + anon + unevictable.

The "total" count is sum of file + anon + unevictable.



6. Hierarchy support

Documentation/cpu-hotplug.txt

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
			Rusty Russell <rusty@rustcorp.com.au>

			Srivatsa Vaddagiri <vatsa@in.ibm.com>

		i386:

			Zwane Mwaikambo <zwane@arm.linux.org.uk>

			Zwane Mwaikambo <zwanem@gmail.com>

		ppc64:

			Nathan Lynch <nathanl@austin.ibm.com>

			Joel Schopp <jschopp@austin.ibm.com>