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

Commit c2d95729 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge first patch-bomb from Andrew Morton:
 - Some pidns/fork/exec tweaks
 - OCFS2 updates
 - Most of MM - there remain quite a few memcg parts which depend on
   pending core cgroups changes.  Which might have been already merged -
   I'll check tomorrow...
 - Various misc stuff all over the place
 - A few block bits which I never got around to sending to Jens -
   relatively minor things.
 - MAINTAINERS maintenance
 - A small number of lib/ updates
 - checkpatch updates
 - epoll
 - firmware/dmi-scan
 - Some kprobes work for S390
 - drivers/rtc updates
 - hfsplus feature work
 - vmcore feature work
 - rbtree upgrades
 - AOE updates
 - pktcdvd cleanups
 - PPS
 - memstick
 - w1
 - New "inittmpfs" feature, which does the obvious
 - More IPC work from Davidlohr.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (303 commits)
  lz4: fix compression/decompression signedness mismatch
  ipc: drop ipc_lock_check
  ipc, shm: drop shm_lock_check
  ipc: drop ipc_lock_by_ptr
  ipc, shm: guard against non-existant vma in shmdt(2)
  ipc: document general ipc locking scheme
  ipc,msg: drop msg_unlock
  ipc: rename ids->rw_mutex
  ipc,shm: shorten critical region for shmat
  ipc,shm: cleanup do_shmat pasta
  ipc,shm: shorten critical region for shmctl
  ipc,shm: make shmctl_nolock lockless
  ipc,shm: introduce shmctl_nolock
  ipc: drop ipcctl_pre_down
  ipc,shm: shorten critical region in shmctl_down
  ipc,shm: introduce lockless functions to obtain the ipc object
  initmpfs: use initramfs if rootfstype= or root= specified
  initmpfs: make rootfs use tmpfs when CONFIG_TMPFS enabled
  initmpfs: move rootfs code from fs/ramfs/ to init/
  initmpfs: move bdi setup from init_rootfs to init_ramfs
  ...
parents bbda1bae b34081f1

Documentation/aoe/udev.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,4 +23,4 @@ SUBSYSTEM=="aoe", KERNEL=="revalidate", NAME="etherd/%k", GROUP="disk", MODE="02 
SUBSYSTEM=="aoe", KERNEL=="flush",	NAME="etherd/%k", GROUP="disk", MODE="0220"



# aoe block devices     

KERNEL=="etherd*",       NAME="%k", GROUP="disk"
 
KERNEL=="etherd*",       GROUP="disk"

Documentation/block/cmdline-partition.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
Embedded device command line partition

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



Read block device partition table from command line.

The partition used for fixed block device (eMMC) embedded device.

It is no MBR, save storage space. Bootloader can be easily accessed

by absolute address of data on the block device.

Users can easily change the partition.



The format for the command line is just like mtdparts:



blkdevparts=<blkdev-def>[;<blkdev-def>]

  <blkdev-def> := <blkdev-id>:<partdef>[,<partdef>]

    <partdef> := <size>[@<offset>](part-name)



<blkdev-id>

    block device disk name, embedded device used fixed block device,

    it's disk name also fixed. such as: mmcblk0, mmcblk1, mmcblk0boot0.



<size>

    partition size, in bytes, such as: 512, 1m, 1G.



<offset>

    partition start address, in bytes.



(part-name)

    partition name, kernel send uevent with "PARTNAME". application can create

    a link to block device partition with the name "PARTNAME".

    user space application can access partition by partition name.



Example:

    eMMC disk name is "mmcblk0" and "mmcblk0boot0"



  bootargs:

    'blkdevparts=mmcblk0:1G(data0),1G(data1),-;mmcblk0boot0:1m(boot),-(kernel)'



  dmesg:

    mmcblk0: p1(data0) p2(data1) p3()

    mmcblk0boot0: p1(boot) p2(kernel)

Documentation/devicetree/bindings/rtc/moxa,moxart-rtc.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
MOXA ART real-time clock



Required properties:



- compatible : Should be "moxa,moxart-rtc"

- gpio-rtc-sclk : RTC sclk gpio, with zero flags

- gpio-rtc-data : RTC data gpio, with zero flags

- gpio-rtc-reset : RTC reset gpio, with zero flags



Example:



	rtc: rtc {

		compatible = "moxa,moxart-rtc";

		gpio-rtc-sclk = <&gpio 5 0>;

		gpio-rtc-data = <&gpio 6 0>;

		gpio-rtc-reset = <&gpio 7 0>;

	};

Documentation/devicetree/bindings/rtc/rtc-omap.txt

+5 −1
Original line number Diff line number Diff line 
TI Real Time Clock



Required properties:

- compatible: "ti,da830-rtc"

- compatible:

	- "ti,da830-rtc"  - for RTC IP used similar to that on DA8xx SoC family.

	- "ti,am3352-rtc" - for RTC IP used similar to that on AM335x SoC family.

			    This RTC IP has special WAKE-EN Register to enable

			    Wakeup generation for event Alarm.

- reg: Address range of rtc register set

- interrupts: rtc timer, alarm interrupts in order

- interrupt-parent: phandle for the interrupt controller

Documentation/devicetree/bindings/rtc/rtc-palmas.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
Palmas RTC controller bindings



Required properties:

- compatible:

  - "ti,palmas-rtc" for palma series of the RTC controller

- interrupt-parent: Parent interrupt device, must be handle of palmas node.

- interrupts: Interrupt number of RTC submodule on device.



Optional properties:



- ti,backup-battery-chargeable: The Palmas series device like TPS65913 or

	TPS80036 supports the backup battery for powering the RTC when main

	battery is removed or in very low power state. The backup battery

	can be chargeable or non-chargeable. This flag will tells whether

	battery is chargeable or not. If charging battery then driver can

	enable the charging.

- ti,backup-battery-charge-high-current: Enable high current charging in

	backup battery. Device supports the < 100mA and > 100mA charging.

	The high current will be > 100mA. Absence of this property will

	charge battery to lower current i.e. < 100mA.



Example:

	palmas: tps65913@58 {

		...

		palmas_rtc: rtc {

			compatible = "ti,palmas-rtc";

			interrupt-parent = <&palmas>;

			interrupts = <8 0>;

			ti,backup-battery-chargeable;

			ti,backup-battery-charge-high-current;

		};

		...

	};