Skip to content

Commit df15929

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into x86/microcode, to pick up merge window changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents efaad55 + 37e13a1 commit df15929

File tree

1,910 files changed

+70595
-29250
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,910 files changed

+70595
-29250
lines changed

‎.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Aaron Durbin <adurbin@google.com>
1111
Adam Oldham <oldhamca@gmail.com>
1212
Adam Radford <aradford@gmail.com>
1313
Adrian Bunk <bunk@stusta.de>
14+
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
1415
Alan Cox <alan@lxorguk.ukuu.org.uk>
1516
Alan Cox <root@hraefn.swansea.linux.org.uk>
1617
Aleksey Gorelov <aleksey_gorelov@phoenix.com>
@@ -94,6 +95,8 @@ Linas Vepstas <linas@austin.ibm.com>
9495
Mark Brown <broonie@sirena.org.uk>
9596
Matthieu CASTET <castet.matthieu@free.fr>
9697
Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>
98+
Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
99+
Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
97100
Mayuresh Janorkar <mayur@ti.com>
98101
Michael Buesch <m@bues.ch>
99102
Michel Dänzer <michel@tungstengraphics.com>

‎Documentation/ABI/testing/configfs-iio

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,16 @@ KernelVersion: 4.4
1919
Description:
2020
High resolution timers directory. Creating a directory here
2121
will result in creating a hrtimer trigger in the IIO subsystem.
22+
23+
What: /config/iio/devices
24+
Date: April 2016
25+
KernelVersion: 4.7
26+
Description:
27+
Industrial IO software devices directory.
28+
29+
What: /config/iio/devices/dummy
30+
Date: April 2016
31+
KernelVersion: 4.7
32+
Description:
33+
Dummy IIO devices directory. Creating a directory here will result
34+
in creating a dummy IIO device in the IIO subystem.

‎Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ Description:
3232
Description of the physical chip / device for device X.
3333
Typically a part number.
3434

35+
What: /sys/bus/iio/devices/iio:deviceX/timestamp_clock
36+
KernelVersion: 4.5
37+
Contact: linux-iio@vger.kernel.org
38+
Description:
39+
String identifying current posix clock used to timestamp
40+
buffered samples and events for device X.
41+
3542
What: /sys/bus/iio/devices/iio:deviceX/sampling_frequency
3643
What: /sys/bus/iio/devices/iio:deviceX/buffer/sampling_frequency
3744
What: /sys/bus/iio/devices/triggerX/sampling_frequency
@@ -1565,3 +1572,10 @@ Description:
15651572
* X is in the plane of the propellers, perpendicular to Y axis,
15661573
and positive towards the starboard side of the UAV ;
15671574
* Z is perpendicular to propellers plane and positive upwards.
1575+
1576+
What: /sys/bus/iio/devices/iio:deviceX/in_electricalconductivity_raw
1577+
KernelVersion: 4.8
1578+
Contact: linux-iio@vger.kernel.org
1579+
Description:
1580+
Raw (unscaled no offset etc.) electric conductivity reading that
1581+
can be processed to siemens per meter.

‎Documentation/ABI/testing/sysfs-bus-iio-health-afe440x

Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,41 @@
1-
What: /sys/bus/iio/devices/iio:deviceX/tia_resistanceY
2-
/sys/bus/iio/devices/iio:deviceX/tia_capacitanceY
3-
Date: December 2015
4-
KernelVersion:
5-
Contact: Andrew F. Davis <afd@ti.com>
6-
Description:
7-
Get and set the resistance and the capacitance settings for the
8-
Transimpedance Amplifier. Y is 1 for Rf1 and Cf1, Y is 2 for
9-
Rf2 and Cf2 values.
10-
11-
What: /sys/bus/iio/devices/iio:deviceX/tia_separate_en
12-
Date: December 2015
13-
KernelVersion:
14-
Contact: Andrew F. Davis <afd@ti.com>
15-
Description:
16-
Enable or disable separate settings for the TransImpedance
17-
Amplifier above, when disabled both values are set by the
18-
first channel.
19-
20-
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_raw
21-
/sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_ambient_raw
22-
Date: December 2015
1+
What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_raw
2+
Date: May 2016
233
KernelVersion:
244
Contact: Andrew F. Davis <afd@ti.com>
255
Description:
266
Get measured values from the ADC for these stages. Y is the
27-
specific LED number. The values are expressed in 24-bit twos
28-
complement.
7+
specific stage number corresponding to datasheet stage names
8+
as follows:
9+
1 -> LED2
10+
2 -> ALED2/LED3
11+
3 -> LED1
12+
4 -> ALED1/LED4
13+
Note that channels 5 and 6 represent LED2-ALED2 and LED1-ALED1
14+
respectively which simply helper channels containing the
15+
calculated difference in the value of stage 1 - 2 and 3 - 4.
16+
The values are expressed in 24-bit twos complement.
2917

30-
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY-ledY_ambient_raw
31-
Date: December 2015
18+
What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_offset
19+
Date: May 2016
3220
KernelVersion:
3321
Contact: Andrew F. Davis <afd@ti.com>
3422
Description:
35-
Get differential values from the ADC for these stages. Y is the
36-
specific LED number. The values are expressed in 24-bit twos
37-
complement for the specified LEDs.
23+
Get and set the offset cancellation DAC setting for these
24+
stages. The values are expressed in 5-bit sign-magnitude.
3825

39-
What: /sys/bus/iio/devices/iio:deviceX/out_current_ledY_offset
40-
/sys/bus/iio/devices/iio:deviceX/out_current_ledY_ambient_offset
41-
Date: December 2015
26+
What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_resistance
27+
What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_capacitance
28+
Date: May 2016
4229
KernelVersion:
4330
Contact: Andrew F. Davis <afd@ti.com>
4431
Description:
45-
Get and set the offset cancellation DAC setting for these
46-
stages. The values are expressed in 5-bit sign-magnitude.
32+
Get and set the resistance and the capacitance settings for the
33+
Transimpedance Amplifier during the associated stage.
4734

48-
What: /sys/bus/iio/devices/iio:deviceX/out_current_ledY_raw
49-
Date: December 2015
35+
What: /sys/bus/iio/devices/iio:deviceX/out_currentY_raw
36+
Date: May 2016
5037
KernelVersion:
5138
Contact: Andrew F. Davis <afd@ti.com>
5239
Description:
53-
Get and set the LED current for the specified LED. Y is the
54-
specific LED number.
40+
Get and set the LED current for the specified LED active during
41+
this stage. Y is the specific stage number.

‎Documentation/DocBook/iio.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@
594594

595595
irqreturn_t sensor_iio_pollfunc(int irq, void *p)
596596
{
597-
pf->timestamp = iio_get_time_ns();
597+
pf->timestamp = iio_get_time_ns((struct indio_dev *)p);
598598
return IRQ_WAKE_THREAD;
599599
}
600600

‎Documentation/RCU/Design/Requirements/Requirements.html

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2391,6 +2391,41 @@ <h3><a name="Energy Efficiency">Energy Efficiency</a></h3>
23912391
idle-loop code.
23922392
Steven Rostedt supplied <tt>_rcuidle</tt> event tracing,
23932393
which is used quite heavily in the idle loop.
2394+
However, there are some restrictions on the code placed within
2395+
<tt>RCU_NONIDLE()</tt>:
2396+
2397+
<ol>
2398+
<li> Blocking is prohibited.
2399+
In practice, this is not a serious restriction given that idle
2400+
tasks are prohibited from blocking to begin with.
2401+
<li> Although nesting <tt>RCU_NONIDLE()</tt> is permited, they cannot
2402+
nest indefinitely deeply.
2403+
However, given that they can be nested on the order of a million
2404+
deep, even on 32-bit systems, this should not be a serious
2405+
restriction.
2406+
This nesting limit would probably be reached long after the
2407+
compiler OOMed or the stack overflowed.
2408+
<li> Any code path that enters <tt>RCU_NONIDLE()</tt> must sequence
2409+
out of that same <tt>RCU_NONIDLE()</tt>.
2410+
For example, the following is grossly illegal:
2411+
2412+
<blockquote>
2413+
<pre>
2414+
1 RCU_NONIDLE({
2415+
2 do_something();
2416+
3 goto bad_idea; /* BUG!!! */
2417+
4 do_something_else();});
2418+
5 bad_idea:
2419+
</pre>
2420+
</blockquote>
2421+
2422+
<p>
2423+
It is just as illegal to transfer control into the middle of
2424+
<tt>RCU_NONIDLE()</tt>'s argument.
2425+
Yes, in theory, you could transfer in as long as you also
2426+
transferred out, but in practice you could also expect to get sharply
2427+
worded review comments.
2428+
</ol>
23942429

23952430
<p>
23962431
It is similarly socially unacceptable to interrupt an

‎Documentation/RCU/stallwarn.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ rcupdate.rcu_task_stall_timeout
4949
This boot/sysfs parameter controls the RCU-tasks stall warning
5050
interval. A value of zero or less suppresses RCU-tasks stall
5151
warnings. A positive value sets the stall-warning interval
52-
in jiffies. An RCU-tasks stall warning starts wtih the line:
52+
in jiffies. An RCU-tasks stall warning starts with the line:
5353

5454
INFO: rcu_tasks detected stalls on tasks:
5555

‎Documentation/RCU/whatisRCU.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ to start learning about RCU:
55
2. What is RCU? Part 2: Usage http://lwn.net/Articles/263130/
66
3. RCU part 3: the RCU API http://lwn.net/Articles/264090/
77
4. The RCU API, 2010 Edition http://lwn.net/Articles/418853/
8+
2010 Big API Table http://lwn.net/Articles/419086/
9+
5. The RCU API, 2014 Edition http://lwn.net/Articles/609904/
10+
2014 Big API Table http://lwn.net/Articles/609973/
811

912

1013
What is RCU?

‎Documentation/devicetree/bindings/extcon/extcon-arizona.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ Optional properties:
4646
The second cell represents the MICBIAS to be used.
4747
The third cell represents the value of the micd-pol-gpio pin.
4848

49-
- wlf,gpsw : Settings for the general purpose switch
49+
- wlf,gpsw : Settings for the general purpose switch, set as one of the
50+
ARIZONA_GPSW_XXX defines.
5051

5152
Example:
5253

‎Documentation/devicetree/bindings/hwmon/apm-xgene-hwmon.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
APM X-Gene hwmon driver
2+
3+
APM X-Gene SOC sensors are accessed over the "SLIMpro" mailbox.
4+
5+
Required properties :
6+
- compatible : should be "apm,xgene-slimpro-hwmon"
7+
- mboxes : use the label reference for the mailbox as the first parameter.
8+
The second parameter is the channel number.
9+
10+
Example :
11+
hwmonslimpro {
12+
compatible = "apm,xgene-slimpro-hwmon";
13+
mboxes = <&mailbox 7>;
14+
};

0 commit comments

Comments
 (0)