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

Commit 37bf0637 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v3.12-rc4' into sched/core 



Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree
before applying more scheduler patches.

Conflicts:
	arch/avr32/include/asm/Kbuild

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6bfa687c d0e639c9

CREDITS

+1 −2
Original line number Diff line number Diff line
@@ -2808,8 +2808,7 @@ S: Ottawa, Ontario 
S: Canada K2P 0X8



N: Mikael Pettersson

E: mikpe@it.uu.se

W: http://user.it.uu.se/~mikpe/linux/

E: mikpelinux@gmail.com

D: Miscellaneous fixes



N: Reed H. Petty

Documentation/arm64/tagged-pointers.txt

+7 −7
Original line number Diff line number Diff line
@@ -18,17 +18,17 @@ this byte for application use, with the following caveats: 
	    parameters containing user virtual addresses *must* have

	    their top byte cleared before trapping to the kernel.



	(2) Tags are not guaranteed to be preserved when delivering

	    signals. This means that signal handlers in applications

	    making use of tags cannot rely on the tag information for

	    user virtual addresses being maintained for fields inside

	    siginfo_t. One exception to this rule is for signals raised

	    in response to debug exceptions, where the tag information

	(2) Non-zero tags are not preserved when delivering signals.

	    This means that signal handlers in applications making use

	    of tags cannot rely on the tag information for user virtual

	    addresses being maintained for fields inside siginfo_t.

	    One exception to this rule is for signals raised in response

	    to watchpoint debug exceptions, where the tag information

	    will be preserved.



	(3) Special care should be taken when using tagged pointers,

	    since it is likely that C compilers will not hazard two

	    addresses differing only in the upper bits.

	    virtual addresses differing only in the upper byte.



The architecture prevents the use of a tagged PC, so the upper byte will

be set to a sign-extension of bit 55 on exception return.

Documentation/block/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ capability.txt 
	- Generic Block Device Capability (/sys/block/<device>/capability)

cfq-iosched.txt

	- CFQ IO scheduler tunables

cmdline-partition.txt

	- how to specify block device partitions on kernel command line

data-integrity.txt

	- Block data integrity

deadline-iosched.txt

Documentation/block/cmdline-partition.txt

+4 −4
Original line number Diff line number Diff line 
Embedded device command line partition

Embedded device command line partition parsing

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



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

Support for reading the block device partition table from the command line.

It is typically used for fixed block (eMMC) embedded devices.

It has no MBR, so saves storage space. Bootloader can be easily accessed

by absolute address of data on the block device.

Users can easily change the partition.

Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt

+5 −5
Original line number Diff line number Diff line 
* Samsung Exynos specific extensions to the Synopsis Designware Mobile

* Samsung Exynos specific extensions to the Synopsys Designware Mobile

  Storage Host Controller



The Synopsis designware mobile storage host controller is used to interface

The Synopsys designware mobile storage host controller is used to interface

a SoC with storage medium such as eMMC or SD/MMC cards. This file documents

differences between the core Synopsis dw mshc controller properties described

by synopsis-dw-mshc.txt and the properties used by the Samsung Exynos specific

extensions to the Synopsis Designware Mobile Storage Host Controller.

differences between the core Synopsys dw mshc controller properties described

by synopsys-dw-mshc.txt and the properties used by the Samsung Exynos specific

extensions to the Synopsys Designware Mobile Storage Host Controller.



Required Properties: