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

Commit 3aacd625 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (incoming from Andrew) 

Merge second patch-bomb from Andrew Morton:
 - various misc bits
 - the rest of MM
 - add generic fixmap.h, use it
 - backlight updates
 - dynamic_debug updates
 - printk() updates
 - checkpatch updates
 - binfmt_elf
 - ramfs
 - init/
 - autofs4
 - drivers/rtc
 - nilfs
 - hfsplus
 - Documentation/
 - coredump
 - procfs
 - fork
 - exec
 - kexec
 - kdump
 - partitions
 - rapidio
 - rbtree
 - userns
 - memstick
 - w1
 - decompressors

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (197 commits)
  lib/decompress_unlz4.c: always set an error return code on failures
  romfs: fix returm err while getting inode in fill_super
  drivers/w1/masters/w1-gpio.c: add strong pullup emulation
  drivers/memstick/host/rtsx_pci_ms.c: fix ms card data transfer bug
  userns: relax the posix_acl_valid() checks
  arch/sh/kernel/dwarf.c: use rbtree postorder iteration helper instead of solution using repeated rb_erase()
  fs-ext3-use-rbtree-postorder-iteration-helper-instead-of-opencoding-fix
  fs/ext3: use rbtree postorder iteration helper instead of opencoding
  fs/jffs2: use rbtree postorder iteration helper instead of opencoding
  fs/ext4: use rbtree postorder iteration helper instead of opencoding
  fs/ubifs: use rbtree postorder iteration helper instead of opencoding
  net/netfilter/ipset/ip_set_hash_netiface.c: use rbtree postorder iteration instead of opencoding
  rbtree/test: test rbtree_postorder_for_each_entry_safe()
  rbtree/test: move rb_node to the middle of the test struct
  rapidio: add modular rapidio core build into powerpc and mips branches
  partitions/efi: complete documentation of gpt kernel param purpose
  kdump: add /sys/kernel/vmcoreinfo ABI documentation
  kdump: fix exported size of vmcoreinfo note
  kexec: add sysctl to disable kexec_load
  fs/exec.c: call arch_pick_mmap_layout() only once
  ...
parents 7e21774d 2a1d689c

Documentation/ABI/testing/sysfs-kernel-vmcoreinfo

0 → 100644
+14 −0
Original line number Diff line number Diff line 
What:		/sys/kernel/vmcoreinfo

Date:		October 2007

KernelVersion:	2.6.24

Contact:	Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>

		Kexec Mailing List <kexec@lists.infradead.org>

		Vivek Goyal <vgoyal@redhat.com>

Description

		Shows physical address and size of vmcoreinfo ELF note.

		First value contains physical address of note in hex and

		second value contains the size of note in hex. This ELF

		note info is parsed by second kernel and exported to user

		space as part of ELF note in /proc/vmcore file. This note

		contains various information like struct size, symbol

		values, page size etc.

Documentation/blockdev/ramdisk.txt

+15 −6
Original line number Diff line number Diff line
@@ -36,21 +36,30 @@ allowing one to squeeze more programs onto an average installation or 
rescue floppy disk.





2) Kernel Command Line Parameters

2) Parameters

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



2a) Kernel Command Line Parameters



	ramdisk_size=N

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



This parameter tells the RAM disk driver to set up RAM disks of N k size.  The

default is 4096 (4 MB) (8192 (8 MB) on S390).

default is 4096 (4 MB).



2b) Module parameters



	ramdisk_blocksize=N

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

	rd_nr

	=====

	/dev/ramX devices created.



This parameter tells the RAM disk driver how many bytes to use per block.  The

default is 1024 (BLOCK_SIZE).

	max_part

	========

	Maximum partition number.



	rd_size

	=======

	See ramdisk_size.



3) Using "rdev -r"

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

Documentation/cpu-hotplug.txt

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ A: This is what you would need in your kernel code to receive notifications. 
		return NOTIFY_OK;

	}



	static struct notifier_block foobar_cpu_notifer =

	static struct notifier_block foobar_cpu_notifier =

	{

	   .notifier_call = foobar_cpu_callback,

	};

Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Haoyu Microelectronics HYM8563 Real Time Clock



The HYM8563 provides basic rtc and alarm functionality

as well as a clock output of up to 32kHz.



Required properties:

- compatible: should be: "haoyu,hym8563"

- reg: i2c address

- interrupts: rtc alarm/event interrupt

- #clock-cells: the value should be 0



Example:



hym8563: hym8563@51 {

	compatible = "haoyu,hym8563";

	reg = <0x51>;



	interrupts = <13 IRQ_TYPE_EDGE_FALLING>;



	#clock-cells = <0>;

};



device {

...

	clocks = <&hym8563>;

...

};

Documentation/devicetree/bindings/rtc/maxim,ds1742.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
* Maxim (Dallas) DS1742/DS1743 Real Time Clock



Required properties:

- compatible: Should contain "maxim,ds1742".

- reg: Physical base address of the RTC and length of memory

  mapped region.



Example:

	rtc: rtc@10000000 {

		compatible = "maxim,ds1742";

		reg = <0x10000000 0x800>;

	};