Skip to content

Commit 5cbb3d2

Browse files
torvaldstorvalds
committed
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() ...
2 parents 9bc9ccd + 4e9b45a commit 5cbb3d2

File tree

287 files changed

+5004
-2378
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+5004
-2378
lines changed

‎CREDITS

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2576,7 +2576,7 @@ S: Toronto, Ontario
25762576
S: Canada
25772577

25782578
N: Zwane Mwaikambo
2579-
E: zwane@arm.linux.org.uk
2579+
E: zwanem@gmail.com
25802580
D: Various driver hacking
25812581
D: Lowlevel x86 kernel hacking
25822582
D: General debugging
@@ -2895,6 +2895,11 @@ S: Framewood Road
28952895
S: Wexham SL3 6PJ
28962896
S: United Kingdom
28972897

2898+
N: Richard Purdie
2899+
E: rpurdie@rpsys.net
2900+
D: Backlight subsystem maintainer
2901+
S: United Kingdom
2902+
28982903
N: Daniel Quinlan
28992904
E: quinlan@pathname.com
29002905
W: http://www.pathname.com/~quinlan/

‎Documentation/ABI/README

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,16 @@ kernel tree without going through the obsolete state first.
7272

7373
It's up to the developer to place their interfaces in the category they
7474
wish for it to start out in.
75+
76+
77+
Notable bits of non-ABI, which should not under any circumstances be considered
78+
stable:
79+
80+
- Kconfig. Userspace should not rely on the presence or absence of any
81+
particular Kconfig symbol, in /proc/config.gz, in the copy of .config
82+
commonly installed to /boot, or in any invocation of the kernel build
83+
process.
84+
85+
- Kernel-internal symbols. Do not rely on the presence, absence, location, or
86+
type of any kernel symbol, either in System.map files or the kernel binary
87+
itself. See Documentation/stable_api_nonsense.txt.

‎Documentation/backlight/lp855x-driver.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ Kernel driver lp855x
44
Backlight driver for LP855x ICs
55

66
Supported chips:
7-
Texas Instruments LP8550, LP8551, LP8552, LP8553, LP8556 and LP8557
7+
Texas Instruments LP8550, LP8551, LP8552, LP8553, LP8555, LP8556 and
8+
LP8557
89

910
Author: Milo(Woogyom) Kim <milo.kim@ti.com>
1011

@@ -24,7 +25,7 @@ Value : pwm based or register based
2425

2526
2) chip_id
2627
The lp855x chip id.
27-
Value : lp8550/lp8551/lp8552/lp8553/lp8556/lp8557
28+
Value : lp8550/lp8551/lp8552/lp8553/lp8555/lp8556/lp8557
2829

2930
Platform data for lp855x
3031
------------------------

‎Documentation/cgroups/memory.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -573,15 +573,19 @@ an memcg since the pages are allowed to be allocated from any physical
573573
node. One of the use cases is evaluating application performance by
574574
combining this information with the application's CPU allocation.
575575

576-
We export "total", "file", "anon" and "unevictable" pages per-node for
577-
each memcg. The ouput format of memory.numa_stat is:
576+
Each memcg's numa_stat file includes "total", "file", "anon" and "unevictable"
577+
per-node page counts including "hierarchical_<counter>" which sums up all
578+
hierarchical children's values in addition to the memcg's own value.
579+
580+
The ouput format of memory.numa_stat is:
578581

579582
total=<total pages> N0=<node 0 pages> N1=<node 1 pages> ...
580583
file=<total file pages> N0=<node 0 pages> N1=<node 1 pages> ...
581584
anon=<total anon pages> N0=<node 0 pages> N1=<node 1 pages> ...
582585
unevictable=<total anon pages> N0=<node 0 pages> N1=<node 1 pages> ...
586+
hierarchical_<counter>=<counter pages> N0=<node 0 pages> N1=<node 1 pages> ...
583587

584-
And we have total = file + anon + unevictable.
588+
The "total" count is sum of file + anon + unevictable.
585589

586590
6. Hierarchy support
587591

‎Documentation/cpu-hotplug.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Rusty Russell <rusty@rustcorp.com.au>
66
Srivatsa Vaddagiri <vatsa@in.ibm.com>
77
i386:
8-
Zwane Mwaikambo <zwane@arm.linux.org.uk>
8+
Zwane Mwaikambo <zwanem@gmail.com>
99
ppc64:
1010
Nathan Lynch <nathanl@austin.ibm.com>
1111
Joel Schopp <jschopp@austin.ibm.com>

‎Documentation/devicetree/bindings/video/backlight/lp855x.txt

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ lp855x bindings
22

33
Required properties:
44
- compatible: "ti,lp8550", "ti,lp8551", "ti,lp8552", "ti,lp8553",
5-
"ti,lp8556", "ti,lp8557"
5+
"ti,lp8555", "ti,lp8556", "ti,lp8557"
66
- reg: I2C slave address (u8)
77
- dev-ctrl: Value of DEVICE CONTROL register (u8). It depends on the device.
88

@@ -15,6 +15,33 @@ Optional properties:
1515

1616
Example:
1717

18+
/* LP8555 */
19+
backlight@2c {
20+
compatible = "ti,lp8555";
21+
reg = <0x2c>;
22+
23+
dev-ctrl = /bits/ 8 <0x00>;
24+
pwm-period = <10000>;
25+
26+
/* 4V OV, 4 output LED0 string enabled */
27+
rom_14h {
28+
rom-addr = /bits/ 8 <0x14>;
29+
rom-val = /bits/ 8 <0xcf>;
30+
};
31+
32+
/* Heavy smoothing, 24ms ramp time step */
33+
rom_15h {
34+
rom-addr = /bits/ 8 <0x15>;
35+
rom-val = /bits/ 8 <0xc7>;
36+
};
37+
38+
/* 4 output LED1 string enabled */
39+
rom_19h {
40+
rom-addr = /bits/ 8 <0x19>;
41+
rom-val = /bits/ 8 <0x0f>;
42+
};
43+
};
44+
1845
/* LP8556 */
1946
backlight@2c {
2047
compatible = "ti,lp8556";

‎Documentation/filesystems/proc.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@ manner. The codes are the following:
460460
nl - non-linear mapping
461461
ar - architecture specific flag
462462
dd - do not include area into core dump
463+
sd - soft-dirty flag
463464
mm - mixed map area
464465
hg - huge page advise flag
465466
nh - no-huge page advise flag

‎Documentation/filesystems/vfat.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ the following:
307307

308308
<proceeding files...>
309309
<slot #3, id = 0x43, characters = "h is long">
310-
<slot #2, id = 0x02, characters = "xtension which">
310+
<slot #2, id = 0x02, characters = "xtension whic">
311311
<slot #1, id = 0x01, characters = "My Big File.E">
312312
<directory entry, name = "MYBIGFIL.EXT">
313313

‎Documentation/gcov.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ Configure the kernel with:
5050
CONFIG_DEBUG_FS=y
5151
CONFIG_GCOV_KERNEL=y
5252

53+
select the gcc's gcov format, default is autodetect based on gcc version:
54+
55+
CONFIG_GCOV_FORMAT_AUTODETECT=y
56+
5357
and to get coverage data for the entire kernel:
5458

5559
CONFIG_GCOV_PROFILE_ALL=y

‎Documentation/kernel-parameters.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,6 +1070,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
10701070
VIA, nVidia)
10711071
verbose: show contents of HPET registers during setup
10721072

1073+
hpet_mmap= [X86, HPET_MMAP] Allow userspace to mmap HPET
1074+
registers. Default set by CONFIG_HPET_MMAP_DEFAULT.
1075+
10731076
hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot.
10741077
hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages.
10751078
On x86-64 and powerpc, this option can be specified
@@ -1775,6 +1778,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
17751778
that the amount of memory usable for all allocations
17761779
is not too small.
17771780

1781+
movable_node [KNL,X86] Boot-time switch to enable the effects
1782+
of CONFIG_MOVABLE_NODE=y. See mm/Kconfig for details.
1783+
17781784
MTD_Partition= [MTD]
17791785
Format: <name>,<region-number>,<size>,<offset>
17801786

0 commit comments

Comments
 (0)