Skip to content

Commit 072e5a1

Browse files
author
Ingo Molnar
committed
Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh the tree
Signed-off-by: Ingo Molnar <[email protected]>
2 parents 294fe0f + d525211 commit 072e5a1

File tree

944 files changed

+10199
-6249
lines changed

Some content is hidden

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

944 files changed

+10199
-6249
lines changed

‎Documentation/CodeOfConflict

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Code of Conflict
2+
----------------
3+
4+
The Linux kernel development effort is a very personal process compared
5+
to "traditional" ways of developing software. Your code and ideas
6+
behind it will be carefully reviewed, often resulting in critique and
7+
criticism. The review will almost always require improvements to the
8+
code before it can be included in the kernel. Know that this happens
9+
because everyone involved wants to see the best possible solution for
10+
the overall success of Linux. This development process has been proven
11+
to create the most robust operating system kernel ever, and we do not
12+
want to do anything to cause the quality of submission and eventual
13+
result to ever decrease.
14+
15+
If however, anyone feels personally abused, threatened, or otherwise
16+
uncomfortable due to this process, that is not acceptable. If so,
17+
please contact the Linux Foundation's Technical Advisory Board at
18+
<[email protected]>, or the individual members, and they
19+
will work to resolve the issue to the best of their ability. For more
20+
information on who is on the Technical Advisory Board and what their
21+
role is, please see:
22+
http://www.linuxfoundation.org/programs/advisory-councils/tab
23+
24+
As a reviewer of code, please strive to keep things civil and focused on
25+
the technical issues involved. We are all humans, and frustrations can
26+
be high on both sides of the process. Try to keep in mind the immortal
27+
words of Bill and Ted, "Be excellent to each other."

‎Documentation/cgroups/unified-hierarchy.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ supported and the interface files "release_agent" and
404404
be understood as an underflow into the highest possible value, -2 or
405405
-10M etc. do not work, so it's not consistent.
406406

407-
memory.low, memory.high, and memory.max will use the string
408-
"infinity" to indicate and set the highest possible value.
407+
memory.low, memory.high, and memory.max will use the string "max" to
408+
indicate and set the highest possible value.
409409

410410
5. Planned Changes
411411

‎Documentation/devicetree/bindings/arm/exynos/power_domain.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Optional Properties:
2222
- pclkN, clkN: Pairs of parent of input clock and input clock to the
2323
devices in this power domain. Maximum of 4 pairs (N = 0 to 3)
2424
are supported currently.
25+
- power-domains: phandle pointing to the parent power domain, for more details
26+
see Documentation/devicetree/bindings/power/power_domain.txt
2527

2628
Node of a device using power domains must have a power-domains property
2729
defined with a phandle to respective power domain.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ Boards with the ST STiH407 SoC shall have the following properties:
1313
Required root node property:
1414
compatible = "st,stih407";
1515

16+
Boards with the ST STiH410 SoC shall have the following properties:
17+
Required root node property:
18+
compatible = "st,stih410";
19+
1620
Boards with the ST STiH418 SoC shall have the following properties:
1721
Required root node property:
1822
compatible = "st,stih418";

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Required properties:
77
- "fsl,vf610-i2c" for I2C compatible with the one integrated on Vybrid vf610 SoC
88
- reg : Should contain I2C/HS-I2C registers location and length
99
- interrupts : Should contain I2C/HS-I2C interrupt
10+
- clocks : Should contain the I2C/HS-I2C clock specifier
1011

1112
Optional properties:
1213
- clock-frequency : Constains desired I2C/HS-I2C bus clock frequency in Hz.

‎Documentation/devicetree/bindings/net/amd-xgbe-phy.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ property is used.
2727
- amd,serdes-cdr-rate: CDR rate speed selection
2828
- amd,serdes-pq-skew: PQ (data sampling) skew
2929
- amd,serdes-tx-amp: TX amplitude boost
30+
- amd,serdes-dfe-tap-config: DFE taps available to run
31+
- amd,serdes-dfe-tap-enable: DFE taps to enable
3032

3133
Example:
3234
xgbe_phy@e1240800 {
@@ -41,4 +43,6 @@ Example:
4143
amd,serdes-cdr-rate = <2>, <2>, <7>;
4244
amd,serdes-pq-skew = <10>, <10>, <30>;
4345
amd,serdes-tx-amp = <15>, <15>, <10>;
46+
amd,serdes-dfe-tap-config = <3>, <3>, <1>;
47+
amd,serdes-dfe-tap-enable = <0>, <0>, <127>;
4448
};

‎Documentation/devicetree/bindings/net/apm-xgene-enet.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ Ethernet nodes are defined to describe on-chip ethernet interfaces in
44
APM X-Gene SoC.
55

66
Required properties for all the ethernet interfaces:
7-
- compatible: Should be "apm,xgene-enet"
7+
- compatible: Should state binding information from the following list,
8+
- "apm,xgene-enet": RGMII based 1G interface
9+
- "apm,xgene1-sgenet": SGMII based 1G interface
10+
- "apm,xgene1-xgenet": XFI based 10G interface
811
- reg: Address and length of the register set for the device. It contains the
912
information of registers in the same order as described by reg-names
1013
- reg-names: Should contain the register set names

‎Documentation/devicetree/bindings/power/power_domain.txt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ Required properties:
1919
providing multiple PM domains (e.g. power controllers), but can be any value
2020
as specified by device tree binding documentation of particular provider.
2121

22+
Optional properties:
23+
- power-domains : A phandle and PM domain specifier as defined by bindings of
24+
the power controller specified by phandle.
25+
Some power domains might be powered from another power domain (or have
26+
other hardware specific dependencies). For representing such dependency
27+
a standard PM domain consumer binding is used. When provided, all domains
28+
created by the given provider should be subdomains of the domain
29+
specified by this binding. More details about power domain specifier are
30+
available in the next section.
31+
2232
Example:
2333

2434
power: power-controller@12340000 {
@@ -30,6 +40,25 @@ Example:
3040
The node above defines a power controller that is a PM domain provider and
3141
expects one cell as its phandle argument.
3242

43+
Example 2:
44+
45+
parent: power-controller@12340000 {
46+
compatible = "foo,power-controller";
47+
reg = <0x12340000 0x1000>;
48+
#power-domain-cells = <1>;
49+
};
50+
51+
child: power-controller@12340000 {
52+
compatible = "foo,power-controller";
53+
reg = <0x12341000 0x1000>;
54+
power-domains = <&parent 0>;
55+
#power-domain-cells = <1>;
56+
};
57+
58+
The nodes above define two power controllers: 'parent' and 'child'.
59+
Domains created by the 'child' power controller are subdomains of '0' power
60+
domain provided by the 'parent' power controller.
61+
3362
==PM domain consumers==
3463

3564
Required properties:

‎Documentation/devicetree/bindings/serial/of-serial.txt renamed to ‎Documentation/devicetree/bindings/serial/8250.txt

File renamed without changes.

‎Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
ETRAX FS UART
2+
3+
Required properties:
4+
- compatible : "axis,etraxfs-uart"
5+
- reg: offset and length of the register set for the device.
6+
- interrupts: device interrupt
7+
8+
Optional properties:
9+
- {dtr,dsr,ri,cd}-gpios: specify a GPIO for DTR/DSR/RI/CD
10+
line respectively.
11+
12+
Example:
13+
14+
serial@b00260000 {
15+
compatible = "axis,etraxfs-uart";
16+
reg = <0xb0026000 0x1000>;
17+
interrupts = <68>;
18+
status = "disabled";
19+
};

‎Documentation/devicetree/bindings/serial/snps-dw-apb-uart.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ Optional properties:
2121
- reg-io-width : the size (in bytes) of the IO accesses that should be
2222
performed on the device. If this property is not present then single byte
2323
accesses are used.
24+
- dcd-override : Override the DCD modem status signal. This signal will always
25+
be reported as active instead of being obtained from the modem status
26+
register. Define this if your serial port does not use this pin.
27+
- dsr-override : Override the DTS modem status signal. This signal will always
28+
be reported as active instead of being obtained from the modem status
29+
register. Define this if your serial port does not use this pin.
30+
- cts-override : Override the CTS modem status signal. This signal will always
31+
be reported as active instead of being obtained from the modem status
32+
register. Define this if your serial port does not use this pin.
33+
- ri-override : Override the RI modem status signal. This signal will always be
34+
reported as inactive instead of being obtained from the modem status register.
35+
Define this if your serial port does not use this pin.
2436

2537
Example:
2638

@@ -31,6 +43,10 @@ Example:
3143
interrupts = <10>;
3244
reg-shift = <2>;
3345
reg-io-width = <4>;
46+
dcd-override;
47+
dsr-override;
48+
cts-override;
49+
ri-override;
3450
};
3551

3652
Example with one clock:

‎Documentation/devicetree/bindings/submitting-patches.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ I. For patch submitters
1212

1313
[email protected]
1414

15+
and Cc: the DT maintainers. Use scripts/get_maintainer.pl to identify
16+
all of the DT maintainers.
17+
1518
3) The Documentation/ portion of the patch should come in the series before
1619
the code implementing the binding.
1720

‎Documentation/devicetree/bindings/vendor-prefixes.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ amlogic Amlogic, Inc.
2020
ams AMS AG
2121
amstaos AMS-Taos Inc.
2222
apm Applied Micro Circuits Corporation (APM)
23+
arasan Arasan Chip Systems
2324
arm ARM Ltd.
2425
armadeus ARMadeus Systems SARL
2526
asahi-kasei Asahi Kasei Corp.
2627
atmel Atmel Corporation
2728
auo AU Optronics Corporation
2829
avago Avago Technologies
2930
avic Shanghai AVIC Optoelectronics Co., Ltd.
31+
axis Axis Communications AB
3032
bosch Bosch Sensortec GmbH
3133
brcm Broadcom Corporation
3234
buffalo Buffalo, Inc.

‎Documentation/devicetree/bindings/watchdog/atmel-wdt.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ Optional properties:
2626
- atmel,disable : Should be present if you want to disable the watchdog.
2727
- atmel,idle-halt : Should be present if you want to stop the watchdog when
2828
entering idle state.
29+
CAUTION: This property should be used with care, it actually makes the
30+
watchdog not counting when the CPU is in idle state, therefore the
31+
watchdog reset time depends on mean CPU usage and will not reset at all
32+
if the CPU stop working while it is in idle state, which is probably
33+
not what you want.
2934
- atmel,dbg-halt : Should be present if you want to stop the watchdog when
3035
entering debug state.
3136

‎Documentation/filesystems/dlmfs.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ system.
55

66
dlmfs is built with OCFS2 as it requires most of its infrastructure.
77

8-
Project web page: http://oss.oracle.com/projects/ocfs2
9-
Tools web page: http://oss.oracle.com/projects/ocfs2-tools
8+
Project web page: http://ocfs2.wiki.kernel.org
9+
Tools web page: https://github.com/markfasheh/ocfs2-tools
1010
OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
1111

1212
All code copyright 2005 Oracle except when otherwise noted.

‎Documentation/filesystems/ocfs2.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ also make it attractive for non-clustered use.
88
You'll want to install the ocfs2-tools package in order to at least
99
get "mount.ocfs2" and "ocfs2_hb_ctl".
1010

11-
Project web page: http://oss.oracle.com/projects/ocfs2
12-
Tools web page: http://oss.oracle.com/projects/ocfs2-tools
11+
Project web page: http://ocfs2.wiki.kernel.org
12+
Tools git tree: https://github.com/markfasheh/ocfs2-tools
1313
OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
1414

1515
All code copyright 2005 Oracle except when otherwise noted.

‎Documentation/power/suspend-and-interrupts.txt

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ but also to IPIs and to some other special-purpose interrupts.
4040

4141
The IRQF_NO_SUSPEND flag is used to indicate that to the IRQ subsystem when
4242
requesting a special-purpose interrupt. It causes suspend_device_irqs() to
43-
leave the corresponding IRQ enabled so as to allow the interrupt to work all
44-
the time as expected.
43+
leave the corresponding IRQ enabled so as to allow the interrupt to work as
44+
expected during the suspend-resume cycle, but does not guarantee that the
45+
interrupt will wake the system from a suspended state -- for such cases it is
46+
necessary to use enable_irq_wake().
4547

4648
Note that the IRQF_NO_SUSPEND flag affects the entire IRQ and not just one
4749
user of it. Thus, if the IRQ is shared, all of the interrupt handlers installed
@@ -110,8 +112,9 @@ any special interrupt handling logic for it to work.
110112
IRQF_NO_SUSPEND and enable_irq_wake()
111113
-------------------------------------
112114

113-
There are no valid reasons to use both enable_irq_wake() and the IRQF_NO_SUSPEND
114-
flag on the same IRQ.
115+
There are very few valid reasons to use both enable_irq_wake() and the
116+
IRQF_NO_SUSPEND flag on the same IRQ, and it is never valid to use both for the
117+
same device.
115118

116119
First of all, if the IRQ is not shared, the rules for handling IRQF_NO_SUSPEND
117120
interrupts (interrupt handlers are invoked after suspend_device_irqs()) are
@@ -120,4 +123,13 @@ handlers are not invoked after suspend_device_irqs()).
120123

121124
Second, both enable_irq_wake() and IRQF_NO_SUSPEND apply to entire IRQs and not
122125
to individual interrupt handlers, so sharing an IRQ between a system wakeup
123-
interrupt source and an IRQF_NO_SUSPEND interrupt source does not make sense.
126+
interrupt source and an IRQF_NO_SUSPEND interrupt source does not generally
127+
make sense.
128+
129+
In rare cases an IRQ can be shared between a wakeup device driver and an
130+
IRQF_NO_SUSPEND user. In order for this to be safe, the wakeup device driver
131+
must be able to discern spurious IRQs from genuine wakeup events (signalling
132+
the latter to the core with pm_system_wakeup()), must use enable_irq_wake() to
133+
ensure that the IRQ will function as a wakeup source, and must request the IRQ
134+
with IRQF_COND_SUSPEND to tell the core that it meets these requirements. If
135+
these requirements are not met, it is not valid to use IRQF_COND_SUSPEND.

‎MAINTAINERS

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,6 +1030,16 @@ F: arch/arm/mach-mxs/
10301030
F: arch/arm/boot/dts/imx*
10311031
F: arch/arm/configs/imx*_defconfig
10321032

1033+
ARM/FREESCALE VYBRID ARM ARCHITECTURE
1034+
M: Shawn Guo <[email protected]>
1035+
M: Sascha Hauer <[email protected]>
1036+
R: Stefan Agner <[email protected]>
1037+
L: [email protected] (moderated for non-subscribers)
1038+
S: Maintained
1039+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
1040+
F: arch/arm/mach-imx/*vf610*
1041+
F: arch/arm/boot/dts/vf*
1042+
10331043
ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
10341044
M: Lennert Buytenhek <[email protected]>
10351045
L: [email protected] (moderated for non-subscribers)
@@ -1188,6 +1198,7 @@ ARM/Marvell Dove/MV78xx0/Orion SOC support
11881198
M: Jason Cooper <[email protected]>
11891199
M: Andrew Lunn <[email protected]>
11901200
M: Sebastian Hesselbarth <[email protected]>
1201+
M: Gregory Clement <[email protected]>
11911202
L: [email protected] (moderated for non-subscribers)
11921203
S: Maintained
11931204
F: arch/arm/mach-dove/
@@ -1730,7 +1741,7 @@ S: Maintained
17301741
F: drivers/net/ethernet/atheros/
17311742

17321743
ATM
1733-
M: Chas Williams <[email protected]>
1744+
M: Chas Williams <[email protected]>
17341745
L: [email protected] (moderated for non-subscribers)
17351746
L: [email protected]
17361747
W: http://linux-atm.sourceforge.net
@@ -2065,7 +2076,7 @@ F: include/net/bluetooth/
20652076
BONDING DRIVER
20662077
M: Jay Vosburgh <[email protected]>
20672078
M: Veaceslav Falico <[email protected]>
2068-
M: Andy Gospodarek <[email protected]>
2079+
M: Andy Gospodarek <[email protected]>
20692080
L: [email protected]
20702081
W: http://sourceforge.net/projects/bonding/
20712082
S: Supported
@@ -2107,7 +2118,6 @@ F: drivers/net/ethernet/broadcom/bnx2x/
21072118

21082119
BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
21092120
M: Christian Daudt <[email protected]>
2110-
M: Matt Porter <[email protected]>
21112121
M: Florian Fainelli <[email protected]>
21122122
L: [email protected]
21132123
T: git git://github.com/broadcom/mach-bcm
@@ -2369,8 +2379,9 @@ F: arch/x86/include/asm/tce.h
23692379

23702380
CAN NETWORK LAYER
23712381
M: Oliver Hartkopp <[email protected]>
2382+
M: Marc Kleine-Budde <[email protected]>
23722383
L: [email protected]
2373-
W: http://gitorious.org/linux-can
2384+
W: https://github.com/linux-can
23742385
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
23752386
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
23762387
S: Maintained
@@ -2386,7 +2397,7 @@ CAN NETWORK DRIVERS
23862397
M: Wolfgang Grandegger <[email protected]>
23872398
M: Marc Kleine-Budde <[email protected]>
23882399
L: [email protected]
2389-
W: http://gitorious.org/linux-can
2400+
W: https://github.com/linux-can
23902401
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
23912402
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
23922403
S: Maintained
@@ -7213,8 +7224,7 @@ ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
72137224
M: Mark Fasheh <[email protected]>
72147225
M: Joel Becker <[email protected]>
72157226
L: [email protected] (moderated for non-subscribers)
7216-
W: http://oss.oracle.com/projects/ocfs2/
7217-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git
7227+
W: http://ocfs2.wiki.kernel.org
72187228
S: Supported
72197229
F: Documentation/filesystems/ocfs2.txt
72207230
F: Documentation/filesystems/dlmfs.txt
@@ -8481,6 +8491,14 @@ S: Supported
84818491
L: [email protected]
84828492
F: drivers/net/ethernet/samsung/sxgbe/
84838493

8494+
SAMSUNG THERMAL DRIVER
8495+
M: Lukasz Majewski <[email protected]>
8496+
L: [email protected]
8497+
L: [email protected]
8498+
S: Supported
8499+
T: https://github.com/lmajewski/linux-samsung-thermal.git
8500+
F: drivers/thermal/samsung/
8501+
84848502
SAMSUNG USB2 PHY DRIVER
84858503
M: Kamil Debski <[email protected]>
84868504
L: [email protected]
@@ -10189,6 +10207,13 @@ S: Maintained
1018910207
F: Documentation/usb/ohci.txt
1019010208
F: drivers/usb/host/ohci*
1019110209

10210+
USB OTG FSM (Finite State Machine)
10211+
M: Peter Chen <[email protected]>
10212+
T: git git://github.com/hzpeterchen/linux-usb.git
10213+
L: [email protected]
10214+
S: Maintained
10215+
F: drivers/usb/common/usb-otg-fsm.c
10216+
1019210217
USB OVER IP DRIVER
1019310218
M: Valentina Manea <[email protected]>
1019410219
M: Shuah Khan <[email protected]>

0 commit comments

Comments
 (0)