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

Commit 7c2db36e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (incoming from Andrew) 

Merge misc patches from Andrew Morton:

 - Florian has vanished so I appear to have become fbdev maintainer
   again :(

 - Joel and Mark are distracted to welcome to the new OCFS2 maintainer

 - The backlight queue

 - Small core kernel changes

 - lib/ updates

 - The rtc queue

 - Various random bits

* akpm: (164 commits)
  rtc: rtc-davinci: use devm_*() functions
  rtc: rtc-max8997: use devm_request_threaded_irq()
  rtc: rtc-max8907: use devm_request_threaded_irq()
  rtc: rtc-da9052: use devm_request_threaded_irq()
  rtc: rtc-wm831x: use devm_request_threaded_irq()
  rtc: rtc-tps80031: use devm_request_threaded_irq()
  rtc: rtc-lp8788: use devm_request_threaded_irq()
  rtc: rtc-coh901331: use devm_clk_get()
  rtc: rtc-vt8500: use devm_*() functions
  rtc: rtc-tps6586x: use devm_request_threaded_irq()
  rtc: rtc-imxdi: use devm_clk_get()
  rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug()
  rtc: rtc-pcf8583: use dev_warn() instead of printk()
  rtc: rtc-sun4v: use pr_warn() instead of printk()
  rtc: rtc-vr41xx: use dev_info() instead of printk()
  rtc: rtc-rs5c313: use pr_err() instead of printk()
  rtc: rtc-at91rm9200: use dev_dbg()/dev_err() instead of printk()/pr_debug()
  rtc: rtc-rs5c372: use dev_dbg()/dev_warn() instead of printk()/pr_debug()
  rtc: rtc-ds2404: use dev_err() instead of printk()
  rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk()
  ...
parents 8b5628ab a47a376f

Documentation/ABI/testing/sysfs-class-bdi

+5 −0
Original line number Diff line number Diff line
@@ -48,3 +48,8 @@ max_ratio (read-write) 
	most of the write-back cache.  For example in case of an NFS

	mount that is prone to get stuck, or a FUSE mount which cannot

	be trusted to play fair.



stable_pages_required (read-only)



	If set, the backing device requires that all pages comprising a write

	request must not be changed until writeout is complete.

Documentation/backlight/lp855x-driver.txt

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



Supported chips:

	Texas Instruments LP8550, LP8551, LP8552, LP8553 and LP8556

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



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


2) chip_id

The lp855x chip id.

Value : lp8550/lp8551/lp8552/lp8553/lp8556

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



Platform data for lp855x

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

Documentation/devicetree/booting-without-of.txt

+1 −1
Original line number Diff line number Diff line
@@ -1228,7 +1228,7 @@ hierarchy and routing of interrupts in the hardware. 
The interrupt tree model is fully described in the

document "Open Firmware Recommended Practice: Interrupt

Mapping Version 0.9".  The document is available at:

<http://playground.sun.com/1275/practice>.

<http://www.openfirmware.org/ofwg/practice/>



1) interrupts property

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

Documentation/printk-formats.txt

+11 −3
Original line number Diff line number Diff line
@@ -53,6 +53,14 @@ Struct Resources: 
	For printing struct resources. The 'R' and 'r' specifiers result in a

	printed resource with ('R') or without ('r') a decoded flags member.



Physical addresses:



	%pa	0x01234567 or 0x0123456789abcdef



	For printing a phys_addr_t type (and its derivatives, such as

	resource_size_t) which can vary based on build options, regardless of

	the width of the CPU data path. Passed by reference.



Raw buffer as a hex string:

	%*ph	00 01 02  ...  3f

	%*phC	00:01:02: ... :3f
@@ -150,9 +158,9 @@ s64 SHOULD be printed with %lld/%llx, (long long): 
	printk("%lld", (long long)s64_var);



If <type> is dependent on a config option for its size (e.g., sector_t,

blkcnt_t, phys_addr_t, resource_size_t) or is architecture-dependent

for its size (e.g., tcflag_t), use a format specifier of its largest

possible type and explicitly cast to it.  Example:

blkcnt_t) or is architecture-dependent for its size (e.g., tcflag_t), use a

format specifier of its largest possible type and explicitly cast to it.

Example:



	printk("test: sector number/total blocks: %llu/%llu\n",

		(unsigned long long)sector, (unsigned long long)blockcount);

MAINTAINERS

+6 −1
Original line number Diff line number Diff line
@@ -1956,7 +1956,8 @@ F: drivers/misc/* 


CHECKPATCH

M:	Andy Whitcroft <apw@canonical.com>

S:	Supported

M:	Joe Perches <joe@perches.com>

S:	Maintained

F:	scripts/checkpatch.pl



CHINESE DOCUMENTATION
@@ -5035,6 +5036,10 @@ L: linux-mm@kvack.org 
W:	http://www.linux-mm.org

S:	Maintained

F:	include/linux/mm.h

F:	include/linux/gfp.h

F:	include/linux/mmzone.h

F:	include/linux/memory_hotplug.h

F:	include/linux/vmalloc.h

F:	mm/



MEMORY RESOURCE CONTROLLER