Skip to content

Commit ef0b8b9

Browse files
author
Ingo Molnar
committed
Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts
Conflicts: arch/x86/platform/efi/efi.c drivers/firmware/efi/Kconfig Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 5c12af0 + d6e0a2d commit ef0b8b9

File tree

1,338 files changed

+14307
-6843
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,338 files changed

+14307
-6843
lines changed

‎CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,11 @@ S: Stanford University
655655
S: Stanford, California 94305
656656
S: USA
657657

658+
N: Carlos Chinea
659+
E: carlos.chinea@nokia.com
660+
E: cch.devel@gmail.com
661+
D: Author of HSI Subsystem
662+
658663
N: Randolph Chung
659664
E: tausq@debian.org
660665
D: Linux/PA-RISC hacker

‎Documentation/Changes

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,6 @@ chmod 0644 /dev/cpu/microcode
196196
as root before you can use this. You'll probably also want to
197197
get the user-space microcode_ctl utility to use with this.
198198

199-
Powertweak
200-
----------
201-
202-
If you are running v0.1.17 or earlier, you should upgrade to
203-
version v0.99.0 or higher. Running old versions may cause problems
204-
with programs using shared memory.
205-
206199
udev
207200
----
208201
udev is a userspace application for populating /dev dynamically with
@@ -366,10 +359,6 @@ Intel P6 microcode
366359
------------------
367360
o <http://www.urbanmyth.org/microcode/>
368361

369-
Powertweak
370-
----------
371-
o <http://powertweak.sourceforge.net/>
372-
373362
udev
374363
----
375364
o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html>

‎Documentation/DocBook/device-drivers.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</sect1>
5959
<sect1><title>Wait queues and Wake events</title>
6060
!Iinclude/linux/wait.h
61-
!Ekernel/wait.c
61+
!Ekernel/sched/wait.c
6262
</sect1>
6363
<sect1><title>High-resolution timers</title>
6464
!Iinclude/linux/ktime.h

‎Documentation/DocBook/media/v4l/vidioc-expbuf.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ range from zero to the maximal number of valid planes for the currently active
7373
format. For the single-planar API, applications must set <structfield> plane
7474
</structfield> to zero. Additional flags may be posted in the <structfield>
7575
flags </structfield> field. Refer to a manual for open() for details.
76-
Currently only O_CLOEXEC is supported. All other fields must be set to zero.
76+
Currently only O_CLOEXEC, O_RDONLY, O_WRONLY, and O_RDWR are supported. All
77+
other fields must be set to zero.
7778
In the case of multi-planar API, every plane is exported separately using
7879
multiple <constant> VIDIOC_EXPBUF </constant> calls. </para>
7980

@@ -170,8 +171,9 @@ multi-planar API. Otherwise this value must be set to zero. </entry>
170171
<entry>__u32</entry>
171172
<entry><structfield>flags</structfield></entry>
172173
<entry>Flags for the newly created file, currently only <constant>
173-
O_CLOEXEC </constant> is supported, refer to the manual of open() for more
174-
details.</entry>
174+
O_CLOEXEC </constant>, <constant>O_RDONLY</constant>, <constant>O_WRONLY
175+
</constant>, and <constant>O_RDWR</constant> are supported, refer to the manual
176+
of open() for more details.</entry>
175177
</row>
176178
<row>
177179
<entry>__s32</entry>

‎Documentation/assoc_array.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,10 @@ This points to a number of methods, all of which need to be provided:
164164

165165
(4) Diff the index keys of two objects.
166166

167-
int (*diff_objects)(const void *a, const void *b);
167+
int (*diff_objects)(const void *object, const void *index_key);
168168

169-
Return the bit position at which the index keys of two objects differ or
170-
-1 if they are the same.
169+
Return the bit position at which the index key of the specified object
170+
differs from the given index key or -1 if they are the same.
171171

172172

173173
(5) Free an object.

‎Documentation/block/null_blk.txt

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
Null block device driver
2+
================================================================================
3+
4+
I. Overview
5+
6+
The null block device (/dev/nullb*) is used for benchmarking the various
7+
block-layer implementations. It emulates a block device of X gigabytes in size.
8+
The following instances are possible:
9+
10+
Single-queue block-layer
11+
- Request-based.
12+
- Single submission queue per device.
13+
- Implements IO scheduling algorithms (CFQ, Deadline, noop).
14+
Multi-queue block-layer
15+
- Request-based.
16+
- Configurable submission queues per device.
17+
No block-layer (Known as bio-based)
18+
- Bio-based. IO requests are submitted directly to the device driver.
19+
- Directly accepts bio data structure and returns them.
20+
21+
All of them have a completion queue for each core in the system.
22+
23+
II. Module parameters applicable for all instances:
24+
25+
queue_mode=[0-2]: Default: 2-Multi-queue
26+
Selects which block-layer the module should instantiate with.
27+
28+
0: Bio-based.
29+
1: Single-queue.
30+
2: Multi-queue.
31+
32+
home_node=[0--nr_nodes]: Default: NUMA_NO_NODE
33+
Selects what CPU node the data structures are allocated from.
34+
35+
gb=[Size in GB]: Default: 250GB
36+
The size of the device reported to the system.
37+
38+
bs=[Block size (in bytes)]: Default: 512 bytes
39+
The block size reported to the system.
40+
41+
nr_devices=[Number of devices]: Default: 2
42+
Number of block devices instantiated. They are instantiated as /dev/nullb0,
43+
etc.
44+
45+
irq_mode=[0-2]: Default: 1-Soft-irq
46+
The completion mode used for completing IOs to the block-layer.
47+
48+
0: None.
49+
1: Soft-irq. Uses IPI to complete IOs across CPU nodes. Simulates the overhead
50+
when IOs are issued from another CPU node than the home the device is
51+
connected to.
52+
2: Timer: Waits a specific period (completion_nsec) for each IO before
53+
completion.
54+
55+
completion_nsec=[ns]: Default: 10.000ns
56+
Combined with irq_mode=2 (timer). The time each completion event must wait.
57+
58+
submit_queues=[0..nr_cpus]:
59+
The number of submission queues attached to the device driver. If unset, it
60+
defaults to 1 on single-queue and bio-based instances. For multi-queue,
61+
it is ignored when use_per_node_hctx module parameter is 1.
62+
63+
hw_queue_depth=[0..qdepth]: Default: 64
64+
The hardware queue depth of the device.
65+
66+
III: Multi-queue specific parameters
67+
68+
use_per_node_hctx=[0/1]: Default: 0
69+
0: The number of submit queues are set to the value of the submit_queues
70+
parameter.
71+
1: The multi-queue block layer is instantiated with a hardware dispatch
72+
queue for each CPU node in the system.

‎Documentation/device-mapper/cache.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,12 @@ E.g.
266266
Invalidation is removing an entry from the cache without writing it
267267
back. Cache blocks can be invalidated via the invalidate_cblocks
268268
message, which takes an arbitrary number of cblock ranges. Each cblock
269-
must be expressed as a decimal value, in the future a variant message
270-
that takes cblock ranges expressed in hexidecimal may be needed to
271-
better support efficient invalidation of larger caches. The cache must
272-
be in passthrough mode when invalidate_cblocks is used.
269+
range's end value is "one past the end", meaning 5-10 expresses a range
270+
of values from 5 to 9. Each cblock must be expressed as a decimal
271+
value, in the future a variant message that takes cblock ranges
272+
expressed in hexidecimal may be needed to better support efficient
273+
invalidation of larger caches. The cache must be in passthrough mode
274+
when invalidate_cblocks is used.
273275

274276
invalidate_cblocks [<cblock>|<cblock begin>-<cblock end>]*
275277

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,18 @@ The MPU contain CPUs, GIC, L2 cache and a local PRCM.
77
Required properties:
88
- compatible : Should be "ti,omap3-mpu" for OMAP3
99
Should be "ti,omap4-mpu" for OMAP4
10+
Should be "ti,omap5-mpu" for OMAP5
1011
- ti,hwmods: "mpu"
1112

1213
Examples:
1314

15+
- For an OMAP5 SMP system:
16+
17+
mpu {
18+
compatible = "ti,omap5-mpu";
19+
ti,hwmods = "mpu"
20+
};
21+
1422
- For an OMAP4 SMP system:
1523

1624
mpu {

‎Documentation/devicetree/bindings/arm/pmu.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ representation in the device tree should be done as under:-
77
Required properties:
88

99
- compatible : should be one of
10+
"arm,armv8-pmuv3"
1011
"arm,cortex-a15-pmu"
1112
"arm,cortex-a9-pmu"
1213
"arm,cortex-a8-pmu"

‎Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ adc@12D10000 {
4949
/* NTC thermistor is a hwmon device */
5050
ncp15wb473@0 {
5151
compatible = "ntc,ncp15wb473";
52-
pullup-uV = <1800000>;
52+
pullup-uv = <1800000>;
5353
pullup-ohm = <47000>;
5454
pulldown-ohm = <0>;
5555
io-channels = <&adc 4>;

‎Documentation/devicetree/bindings/clock/exynos4-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SoC's in the Exynos4 family.
66

77
Required Properties:
88

9-
- comptible: should be one of the following.
9+
- compatible: should be one of the following.
1010
- "samsung,exynos4210-clock" - controller compatible with Exynos4210 SoC.
1111
- "samsung,exynos4412-clock" - controller compatible with Exynos4412 SoC.
1212

‎Documentation/devicetree/bindings/clock/exynos5250-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ controllers within the Exynos5250 SoC.
55

66
Required Properties:
77

8-
- comptible: should be one of the following.
8+
- compatible: should be one of the following.
99
- "samsung,exynos5250-clock" - controller compatible with Exynos5250 SoC.
1010

1111
- reg: physical base address of the controller and length of memory mapped

‎Documentation/devicetree/bindings/clock/exynos5420-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ controllers within the Exynos5420 SoC.
55

66
Required Properties:
77

8-
- comptible: should be one of the following.
8+
- compatible: should be one of the following.
99
- "samsung,exynos5420-clock" - controller compatible with Exynos5420 SoC.
1010

1111
- reg: physical base address of the controller and length of memory mapped

‎Documentation/devicetree/bindings/clock/exynos5440-clock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ controllers within the Exynos5440 SoC.
55

66
Required Properties:
77

8-
- comptible: should be "samsung,exynos5440-clock".
8+
- compatible: should be "samsung,exynos5440-clock".
99

1010
- reg: physical base address of the controller and length of memory mapped
1111
region.

‎Documentation/devicetree/bindings/gpio/8xxx_gpio.txt

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,56 +5,70 @@ This is for the non-QE/CPM/GUTs GPIO controllers as found on
55

66
Every GPIO controller node must have #gpio-cells property defined,
77
this information will be used to translate gpio-specifiers.
8+
See bindings/gpio/gpio.txt for details of how to specify GPIO
9+
information for devices.
10+
11+
The GPIO module usually is connected to the SoC's internal interrupt
12+
controller, see bindings/interrupt-controller/interrupts.txt (the
13+
interrupt client nodes section) for details how to specify this GPIO
14+
module's interrupt.
15+
16+
The GPIO module may serve as another interrupt controller (cascaded to
17+
the SoC's internal interrupt controller). See the interrupt controller
18+
nodes section in bindings/interrupt-controller/interrupts.txt for
19+
details.
820

921
Required properties:
10-
- compatible : "fsl,<CHIP>-gpio" followed by "fsl,mpc8349-gpio" for
11-
83xx, "fsl,mpc8572-gpio" for 85xx and "fsl,mpc8610-gpio" for 86xx.
12-
- #gpio-cells : Should be two. The first cell is the pin number and the
13-
second cell is used to specify optional parameters (currently unused).
14-
- interrupts : Interrupt mapping for GPIO IRQ.
15-
- interrupt-parent : Phandle for the interrupt controller that
16-
services interrupts for this device.
17-
- gpio-controller : Marks the port as GPIO controller.
22+
- compatible: "fsl,<chip>-gpio" followed by "fsl,mpc8349-gpio"
23+
for 83xx, "fsl,mpc8572-gpio" for 85xx, or
24+
"fsl,mpc8610-gpio" for 86xx.
25+
- #gpio-cells: Should be two. The first cell is the pin number
26+
and the second cell is used to specify optional
27+
parameters (currently unused).
28+
- interrupt-parent: Phandle for the interrupt controller that
29+
services interrupts for this device.
30+
- interrupts: Interrupt mapping for GPIO IRQ.
31+
- gpio-controller: Marks the port as GPIO controller.
32+
33+
Optional properties:
34+
- interrupt-controller: Empty boolean property which marks the GPIO
35+
module as an IRQ controller.
36+
- #interrupt-cells: Should be two. Defines the number of integer
37+
cells required to specify an interrupt within
38+
this interrupt controller. The first cell
39+
defines the pin number, the second cell
40+
defines additional flags (trigger type,
41+
trigger polarity). Note that the available
42+
set of trigger conditions supported by the
43+
GPIO module depends on the actual SoC.
1844

1945
Example of gpio-controller nodes for a MPC8347 SoC:
2046

2147
gpio1: gpio-controller@c00 {
2248
#gpio-cells = <2>;
2349
compatible = "fsl,mpc8347-gpio", "fsl,mpc8349-gpio";
2450
reg = <0xc00 0x100>;
25-
interrupts = <74 0x8>;
2651
interrupt-parent = <&ipic>;
52+
interrupts = <74 0x8>;
2753
gpio-controller;
54+
interrupt-controller;
55+
#interrupt-cells = <2>;
2856
};
2957

3058
gpio2: gpio-controller@d00 {
3159
#gpio-cells = <2>;
3260
compatible = "fsl,mpc8347-gpio", "fsl,mpc8349-gpio";
3361
reg = <0xd00 0x100>;
34-
interrupts = <75 0x8>;
3562
interrupt-parent = <&ipic>;
63+
interrupts = <75 0x8>;
3664
gpio-controller;
3765
};
3866

39-
See booting-without-of.txt for details of how to specify GPIO
40-
information for devices.
41-
42-
To use GPIO pins as interrupt sources for peripherals, specify the
43-
GPIO controller as the interrupt parent and define GPIO number +
44-
trigger mode using the interrupts property, which is defined like
45-
this:
46-
47-
interrupts = <number trigger>, where:
48-
- number: GPIO pin (0..31)
49-
- trigger: trigger mode:
50-
2 = trigger on falling edge
51-
3 = trigger on both edges
52-
53-
Example of device using this is:
67+
Example of a peripheral using the GPIO module as an IRQ controller:
5468

5569
funkyfpga@0 {
5670
compatible = "funky-fpga";
5771
...
58-
interrupts = <4 3>;
5972
interrupt-parent = <&gpio1>;
73+
interrupts = <4 3>;
6074
};

‎Documentation/devicetree/bindings/i2c/i2c-omap.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
I2C for OMAP platforms
22

33
Required properties :
4-
- compatible : Must be "ti,omap3-i2c" or "ti,omap4-i2c"
4+
- compatible : Must be "ti,omap2420-i2c", "ti,omap2430-i2c", "ti,omap3-i2c"
5+
or "ti,omap4-i2c"
56
- ti,hwmods : Must be "i2c<n>", n being the instance number (1-based)
67
- #address-cells = <1>;
78
- #size-cells = <0>;

0 commit comments

Comments
 (0)