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

Commit ffe732c2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/urgent' into sched/core 



Merge the latest batch of fixes before applying development patches.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 40ea2b42 757dfcaa

CREDITS

+5 −0
Original line number Original line Diff line number Diff line
@@ -655,6 +655,11 @@ S: Stanford University 
S: Stanford, California 94305

S: Stanford, California 94305

S: USA

S: USA





N: Carlos Chinea

E: carlos.chinea@nokia.com

E: cch.devel@gmail.com

D: Author of HSI Subsystem



N: Randolph Chung

N: Randolph Chung

E: tausq@debian.org

E: tausq@debian.org

D: Linux/PA-RISC hacker

D: Linux/PA-RISC hacker

Documentation/Changes

+0 −11
Original line number Original line Diff line number Diff line
@@ -196,13 +196,6 @@ chmod 0644 /dev/cpu/microcode 
as root before you can use this.  You'll probably also want to

as root before you can use this.  You'll probably also want to

get the user-space microcode_ctl utility to use with this.

get the user-space microcode_ctl utility to use with this.





Powertweak

----------



If you are running v0.1.17 or earlier, you should upgrade to

version v0.99.0 or higher. Running old versions may cause problems

with programs using shared memory.



udev

udev

----

----

udev is a userspace application for populating /dev dynamically with

udev is a userspace application for populating /dev dynamically with
@@ -366,10 +359,6 @@ Intel P6 microcode 
------------------

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

o  <http://www.urbanmyth.org/microcode/>

o  <http://www.urbanmyth.org/microcode/>





Powertweak

----------

o  <http://powertweak.sourceforge.net/>



udev

udev

----

----

o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html>

o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html>

Documentation/DocBook/device-drivers.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ 
     </sect1>

     </sect1>

     <sect1><title>Wait queues and Wake events</title>

     <sect1><title>Wait queues and Wake events</title>

!Iinclude/linux/wait.h

!Iinclude/linux/wait.h

!Ekernel/wait.c

!Ekernel/sched/wait.c

     </sect1>

     </sect1>

     <sect1><title>High-resolution timers</title>

     <sect1><title>High-resolution timers</title>

!Iinclude/linux/ktime.h

!Iinclude/linux/ktime.h

Documentation/devicetree/bindings/arm/omap/mpu.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -7,10 +7,18 @@ The MPU contain CPUs, GIC, L2 cache and a local PRCM. 
Required properties:

Required properties:

- compatible : Should be "ti,omap3-mpu" for OMAP3

- compatible : Should be "ti,omap3-mpu" for OMAP3

               Should be "ti,omap4-mpu" for OMAP4

               Should be "ti,omap4-mpu" for OMAP4

	       Should be "ti,omap5-mpu" for OMAP5

- ti,hwmods: "mpu"

- ti,hwmods: "mpu"





Examples:

Examples:





- For an OMAP5 SMP system:



mpu {

    compatible = "ti,omap5-mpu";

    ti,hwmods = "mpu"

};



- For an OMAP4 SMP system:

- For an OMAP4 SMP system:





mpu {

mpu {

Documentation/devicetree/bindings/arm/pmu.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ representation in the device tree should be done as under:- 
Required properties:

Required properties:





- compatible : should be one of

- compatible : should be one of

	"arm,armv8-pmuv3"

	"arm,cortex-a15-pmu"

	"arm,cortex-a15-pmu"

	"arm,cortex-a9-pmu"

	"arm,cortex-a9-pmu"

	"arm,cortex-a8-pmu"

	"arm,cortex-a8-pmu"