Skip to content

Commit 8af3136

Browse files
author
Ingo Molnar
committed
Merge tag 'v4.16-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <[email protected]>
2 parents ddc4bec + 661e50b commit 8af3136

File tree

865 files changed

+8189
-4734
lines changed

Some content is hidden

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

865 files changed

+8189
-4734
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,7 @@ all.config
127127

128128
# Kdevelop4
129129
*.kdev4
130+
131+
#Automatically generated by ASN.1 compiler
132+
net/ipv4/netfilter/nf_nat_snmp_basic-asn1.c
133+
net/ipv4/netfilter/nf_nat_snmp_basic-asn1.h

‎Documentation/ABI/testing/sysfs-devices-platform-dock

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
What: /sys/devices/platform/dock.N/docked
2+
Date: Dec, 2006
3+
KernelVersion: 2.6.19
4+
Contact: [email protected]
5+
Description:
6+
(RO) Value 1 or 0 indicates whether the software believes the
7+
laptop is docked in a docking station.
8+
9+
What: /sys/devices/platform/dock.N/undock
10+
Date: Dec, 2006
11+
KernelVersion: 2.6.19
12+
Contact: [email protected]
13+
Description:
14+
(WO) Writing to this file causes the software to initiate an
15+
undock request to the firmware.
16+
17+
What: /sys/devices/platform/dock.N/uid
18+
Date: Feb, 2007
19+
KernelVersion: v2.6.21
20+
Contact: [email protected]
21+
Description:
22+
(RO) Displays the docking station the laptop is docked to.
23+
24+
What: /sys/devices/platform/dock.N/flags
25+
Date: May, 2007
26+
KernelVersion: v2.6.21
27+
Contact: [email protected]
28+
Description:
29+
(RO) Show dock station flags, useful for checking if undock
30+
request has been made by the user (from the immediate_undock
31+
option).
32+
33+
What: /sys/devices/platform/dock.N/type
34+
Date: Aug, 2008
35+
KernelVersion: v2.6.27
36+
Contact: [email protected]
37+
Description:
38+
(RO) Display the dock station type- dock_station, ata_bay or
39+
battery_bay.

‎Documentation/ABI/testing/sysfs-devices-system-cpu

Lines changed: 75 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ Description: CPU topology files that describe a logical CPU's relationship
108108

109109
What: /sys/devices/system/cpu/cpuidle/current_driver
110110
/sys/devices/system/cpu/cpuidle/current_governer_ro
111+
/sys/devices/system/cpu/cpuidle/available_governors
112+
/sys/devices/system/cpu/cpuidle/current_governor
111113
Date: September 2007
112114
Contact: Linux kernel mailing list <[email protected]>
113115
Description: Discover cpuidle policy and mechanism
@@ -119,13 +121,84 @@ Description: Discover cpuidle policy and mechanism
119121
Idle policy (governor) is differentiated from idle mechanism
120122
(driver)
121123

122-
current_driver: displays current idle mechanism
124+
current_driver: (RO) displays current idle mechanism
123125

124-
current_governor_ro: displays current idle policy
126+
current_governor_ro: (RO) displays current idle policy
127+
128+
With the cpuidle_sysfs_switch boot option enabled (meant for
129+
developer testing), the following three attributes are visible
130+
instead:
131+
132+
current_driver: same as described above
133+
134+
available_governors: (RO) displays a space separated list of
135+
available governors
136+
137+
current_governor: (RW) displays current idle policy. Users can
138+
switch the governor at runtime by writing to this file.
125139

126140
See files in Documentation/cpuidle/ for more information.
127141

128142

143+
What: /sys/devices/system/cpu/cpuX/cpuidle/stateN/name
144+
/sys/devices/system/cpu/cpuX/cpuidle/stateN/latency
145+
/sys/devices/system/cpu/cpuX/cpuidle/stateN/power
146+
/sys/devices/system/cpu/cpuX/cpuidle/stateN/time
147+
/sys/devices/system/cpu/cpuX/cpuidle/stateN/usage
148+
Date: September 2007
149+
KernelVersion: v2.6.24
150+
Contact: Linux power management list <[email protected]>
151+
Description:
152+
The directory /sys/devices/system/cpu/cpuX/cpuidle contains per
153+
logical CPU specific cpuidle information for each online cpu X.
154+
The processor idle states which are available for use have the
155+
following attributes:
156+
157+
name: (RO) Name of the idle state (string).
158+
159+
latency: (RO) The latency to exit out of this idle state (in
160+
microseconds).
161+
162+
power: (RO) The power consumed while in this idle state (in
163+
milliwatts).
164+
165+
time: (RO) The total time spent in this idle state (in microseconds).
166+
167+
usage: (RO) Number of times this state was entered (a count).
168+
169+
170+
What: /sys/devices/system/cpu/cpuX/cpuidle/stateN/desc
171+
Date: February 2008
172+
KernelVersion: v2.6.25
173+
Contact: Linux power management list <[email protected]>
174+
Description:
175+
(RO) A small description about the idle state (string).
176+
177+
178+
What: /sys/devices/system/cpu/cpuX/cpuidle/stateN/disable
179+
Date: March 2012
180+
KernelVersion: v3.10
181+
Contact: Linux power management list <[email protected]>
182+
Description:
183+
(RW) Option to disable this idle state (bool). The behavior and
184+
the effect of the disable variable depends on the implementation
185+
of a particular governor. In the ladder governor, for example,
186+
it is not coherent, i.e. if one is disabling a light state, then
187+
all deeper states are disabled as well, but the disable variable
188+
does not reflect it. Likewise, if one enables a deep state but a
189+
lighter state still is disabled, then this has no effect.
190+
191+
192+
What: /sys/devices/system/cpu/cpuX/cpuidle/stateN/residency
193+
Date: March 2014
194+
KernelVersion: v3.15
195+
Contact: Linux power management list <[email protected]>
196+
Description:
197+
(RO) Display the target residency i.e. the minimum amount of
198+
time (in microseconds) this cpu should spend in this idle state
199+
to make the transition worth the effort.
200+
201+
129202
What: /sys/devices/system/cpu/cpu#/cpufreq/*
130203
Date: pre-git history
131204
Contact: [email protected]

‎Documentation/ABI/testing/sysfs-platform-dptf

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
What: /sys/bus/platform/devices/INT3407:00/dptf_power/charger_type
2+
Date: Jul, 2016
3+
KernelVersion: v4.10
4+
Contact: [email protected]
5+
Description:
6+
(RO) The charger type - Traditional, Hybrid or NVDC.
7+
8+
What: /sys/bus/platform/devices/INT3407:00/dptf_power/adapter_rating_mw
9+
Date: Jul, 2016
10+
KernelVersion: v4.10
11+
Contact: [email protected]
12+
Description:
13+
(RO) Adapter rating in milliwatts (the maximum Adapter power).
14+
Must be 0 if no AC Adaptor is plugged in.
15+
16+
What: /sys/bus/platform/devices/INT3407:00/dptf_power/max_platform_power_mw
17+
Date: Jul, 2016
18+
KernelVersion: v4.10
19+
Contact: [email protected]
20+
Description:
21+
(RO) Maximum platform power that can be supported by the battery
22+
in milliwatts.
23+
24+
What: /sys/bus/platform/devices/INT3407:00/dptf_power/platform_power_source
25+
Date: Jul, 2016
26+
KernelVersion: v4.10
27+
Contact: [email protected]
28+
Description:
29+
(RO) Display the platform power source
30+
0x00 = DC
31+
0x01 = AC
32+
0x02 = USB
33+
0x03 = Wireless Charger
34+
35+
What: /sys/bus/platform/devices/INT3407:00/dptf_power/battery_steady_power
36+
Date: Jul, 2016
37+
KernelVersion: v4.10
38+
Contact: [email protected]
39+
Description:
40+
(RO) The maximum sustained power for battery in milliwatts.

‎Documentation/PCI/pci.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,9 @@ your driver if they're helpful, or just use plain hex constants.
570570
The device IDs are arbitrary hex numbers (vendor controlled) and normally used
571571
only in a single location, the pci_device_id table.
572572

573-
Please DO submit new vendor/device IDs to http://pciids.sourceforge.net/.
573+
Please DO submit new vendor/device IDs to http://pci-ids.ucw.cz/.
574+
There are mirrors of the pci.ids file at http://pciids.sourceforge.net/
575+
and https://github.com/pciutils/pciids.
574576

575577

576578

‎Documentation/atomic_bitops.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,12 @@ Like with atomic_t, the rule of thumb is:
5858

5959
- RMW operations that have a return value are fully ordered.
6060

61-
Except for test_and_set_bit_lock() which has ACQUIRE semantics and
61+
- RMW operations that are conditional are unordered on FAILURE,
62+
otherwise the above rules apply. In the case of test_and_{}_bit() operations,
63+
if the bit in memory is unchanged by the operation then it is deemed to have
64+
failed.
65+
66+
Except for a successful test_and_set_bit_lock() which has ACQUIRE semantics and
6267
clear_bit_unlock() which has RELEASE semantics.
6368

6469
Since a platform only has a single means of achieving atomic operations

‎Documentation/devicetree/bindings/misc/arm-charlcd.txt renamed to ‎Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt

File renamed without changes.

‎Documentation/devicetree/bindings/eeprom/at24.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ Required properties:
3838

3939
"catalyst",
4040
"microchip",
41+
"nxp",
4142
"ramtron",
4243
"renesas",
43-
"nxp",
4444
"st",
4545

4646
Some vendors use different model names for chips which are just

‎Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Required properties:
1414
- "renesas,irqc-r8a7794" (R-Car E2)
1515
- "renesas,intc-ex-r8a7795" (R-Car H3)
1616
- "renesas,intc-ex-r8a7796" (R-Car M3-W)
17+
- "renesas,intc-ex-r8a77965" (R-Car M3-N)
1718
- "renesas,intc-ex-r8a77970" (R-Car V3M)
1819
- "renesas,intc-ex-r8a77995" (R-Car D3)
1920
- #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in

‎Documentation/devicetree/bindings/power/wakeup-source.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Examples
6060
#size-cells = <0>;
6161

6262
button@1 {
63-
debounce_interval = <50>;
63+
debounce-interval = <50>;
6464
wakeup-source;
6565
linux,code = <116>;
6666
label = "POWER";

‎Documentation/devicetree/bindings/thermal/imx-thermal.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,32 @@ Optional properties:
2222
- clocks : thermal sensor's clock source.
2323

2424
Example:
25+
ocotp: ocotp@21bc000 {
26+
#address-cells = <1>;
27+
#size-cells = <1>;
28+
compatible = "fsl,imx6sx-ocotp", "syscon";
29+
reg = <0x021bc000 0x4000>;
30+
clocks = <&clks IMX6SX_CLK_OCOTP>;
2531

32+
tempmon_calib: calib@38 {
33+
reg = <0x38 4>;
34+
};
35+
36+
tempmon_temp_grade: temp-grade@20 {
37+
reg = <0x20 4>;
38+
};
39+
};
40+
41+
tempmon: tempmon {
42+
compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";
43+
interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
44+
fsl,tempmon = <&anatop>;
45+
nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
46+
nvmem-cell-names = "calib", "temp_grade";
47+
clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
48+
};
49+
50+
Legacy method (Deprecated):
2651
tempmon {
2752
compatible = "fsl,imx6q-tempmon";
2853
fsl,tempmon = <&anatop>;

‎Documentation/features/sched/membarrier-sync-core/arch-support.txt

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#
2+
# Feature name: membarrier-sync-core
3+
# Kconfig: ARCH_HAS_MEMBARRIER_SYNC_CORE
4+
# description: arch supports core serializing membarrier
5+
#
6+
# Architecture requirements
7+
#
8+
# * arm64
9+
#
10+
# Rely on eret context synchronization when returning from IPI handler, and
11+
# when returning to user-space.
12+
#
13+
# * x86
14+
#
15+
# x86-32 uses IRET as return from interrupt, which takes care of the IPI.
16+
# However, it uses both IRET and SYSEXIT to go back to user-space. The IRET
17+
# instruction is core serializing, but not SYSEXIT.
18+
#
19+
# x86-64 uses IRET as return from interrupt, which takes care of the IPI.
20+
# However, it can return to user-space through either SYSRETL (compat code),
21+
# SYSRETQ, or IRET.
22+
#
23+
# Given that neither SYSRET{L,Q}, nor SYSEXIT, are core serializing, we rely
24+
# instead on write_cr3() performed by switch_mm() to provide core serialization
25+
# after changing the current mm, and deal with the special case of kthread ->
26+
# uthread (temporarily keeping current mm into active_mm) by issuing a
27+
# sync_core_before_usermode() in that specific case.
28+
#
29+
-----------------------
30+
| arch |status|
31+
-----------------------
32+
| alpha: | TODO |
33+
| arc: | TODO |
34+
| arm: | TODO |
35+
| arm64: | ok |
36+
| blackfin: | TODO |
37+
| c6x: | TODO |
38+
| cris: | TODO |
39+
| frv: | TODO |
40+
| h8300: | TODO |
41+
| hexagon: | TODO |
42+
| ia64: | TODO |
43+
| m32r: | TODO |
44+
| m68k: | TODO |
45+
| metag: | TODO |
46+
| microblaze: | TODO |
47+
| mips: | TODO |
48+
| mn10300: | TODO |
49+
| nios2: | TODO |
50+
| openrisc: | TODO |
51+
| parisc: | TODO |
52+
| powerpc: | TODO |
53+
| s390: | TODO |
54+
| score: | TODO |
55+
| sh: | TODO |
56+
| sparc: | TODO |
57+
| tile: | TODO |
58+
| um: | TODO |
59+
| unicore32: | TODO |
60+
| x86: | ok |
61+
| xtensa: | TODO |
62+
-----------------------

‎Documentation/gpu/tve200.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
==================================
44

55
.. kernel-doc:: drivers/gpu/drm/tve200/tve200_drv.c
6-
:doc: Faraday TV Encoder 200
6+
:doc: Faraday TV Encoder TVE200 DRM Driver

‎Documentation/i2c/busses/i2c-i801

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ Supported adapters:
2828
* Intel Wildcat Point (PCH)
2929
* Intel Wildcat Point-LP (PCH)
3030
* Intel BayTrail (SOC)
31+
* Intel Braswell (SOC)
3132
* Intel Sunrise Point-H (PCH)
3233
* Intel Sunrise Point-LP (PCH)
34+
* Intel Kaby Lake-H (PCH)
3335
* Intel DNV (SOC)
3436
* Intel Broxton (SOC)
3537
* Intel Lewisburg (PCH)

0 commit comments

Comments
 (0)