Skip to content

Commit f108c89

Browse files
author
Ingo Molnar
committed
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <[email protected]>
2 parents 904cb36 + 6805591 commit f108c89

File tree

948 files changed

+19614
-8632
lines changed

Some content is hidden

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

948 files changed

+19614
-8632
lines changed

‎Documentation/ABI/testing/sysfs-ibft

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ Date: November 2007
2020
Contact: Konrad Rzeszutek <[email protected]>
2121
Description: The /sys/firmware/ibft/ethernetX directory will contain
2222
files that expose the iSCSI Boot Firmware Table NIC data.
23-
This can this can the IP address, MAC, and gateway of the NIC.
23+
Usually this contains the IP address, MAC, and gateway of the NIC.

‎Documentation/DocBook/media/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ GENFILES := $(addprefix $(MEDIA_OBJ_DIR)/, $(MEDIA_TEMP))
2525
PHONY += cleanmediadocs
2626

2727
cleanmediadocs:
28-
-@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null
28+
-@rm -f `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null
2929

3030
$(obj)/media_api.xml: $(GENFILES) FORCE
3131

‎Documentation/DocBook/media/v4l/compat.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2566,6 +2566,10 @@ fields changed from _s32 to _u32.
25662566
<para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;.
25672567
</para>
25682568
</listitem>
2569+
</orderedlist>
2570+
</section>
2571+
2572+
<section>
25692573
<title>V4L2 in Linux 3.18</title>
25702574
<orderedlist>
25712575
<listitem>

‎Documentation/HOWTO

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,6 @@ tree, they need to be integration-tested. For this purpose, a special
324324
testing repository exists into which virtually all subsystem trees are
325325
pulled on an almost daily basis:
326326
http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git
327-
http://linux.f-seidel.de/linux-next/pmwiki/
328327

329328
This way, the -next kernel gives a summary outlook onto what will be
330329
expected to go into the mainline kernel at the next merge period.

‎Documentation/SubmittingPatches

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -483,12 +483,10 @@ have been included in the discussion
483483

484484
14) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:
485485

486-
If this patch fixes a problem reported by somebody else, consider adding a
487-
Reported-by: tag to credit the reporter for their contribution. Please
488-
note that this tag should not be added without the reporter's permission,
489-
especially if the problem was not reported in a public forum. That said,
490-
if we diligently credit our bug reporters, they will, hopefully, be
491-
inspired to help us again in the future.
486+
The Reported-by tag gives credit to people who find bugs and report them and it
487+
hopefully inspires them to help us again in the future. Please note that if
488+
the bug was reported in private, then ask for permission first before using the
489+
Reported-by tag.
492490

493491
A Tested-by: tag indicates that the patch has been successfully tested (in
494492
some environment) by the person named. This tag informs maintainers that

‎Documentation/arm64/memory.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ User addresses have bits 63:48 set to 0 while the kernel addresses have
1717
the same bits set to 1. TTBRx selection is given by bit 63 of the
1818
virtual address. The swapper_pg_dir contains only kernel (global)
1919
mappings while the user pgd contains only user (non-global) mappings.
20-
The swapper_pgd_dir address is written to TTBR1 and never written to
20+
The swapper_pg_dir address is written to TTBR1 and never written to
2121
TTBR0.
2222

2323

‎Documentation/development-process/2.Process

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,6 @@ lists when they are assembled; they can be downloaded from:
289289

290290
http://www.kernel.org/pub/linux/kernel/next/
291291

292-
Some information about linux-next has been gathered at:
293-
294-
http://linux.f-seidel.de/linux-next/pmwiki/
295-
296292
Linux-next has become an integral part of the kernel development process;
297293
all patches merged during a given merge window should really have found
298294
their way into linux-next some time before the merge window opens.

‎Documentation/development-process/8.Conclusion

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ Beyond that, a valuable resource for kernel developers is:
2222

2323
http://kernelnewbies.org/
2424

25-
Information about the linux-next tree gathers at:
26-
27-
http://linux.f-seidel.de/linux-next/pmwiki/
28-
2925
And, of course, one should not forget http://kernel.org/, the definitive
3026
location for kernel release information.
3127

‎Documentation/devicetree/bindings/mailbox/mailbox.txt

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
* Generic Mailbox Controller and client driver bindings
2+
3+
Generic binding to provide a way for Mailbox controller drivers to
4+
assign appropriate mailbox channel to client drivers.
5+
6+
* Mailbox Controller
7+
8+
Required property:
9+
- #mbox-cells: Must be at least 1. Number of cells in a mailbox
10+
specifier.
11+
12+
Example:
13+
mailbox: mailbox {
14+
...
15+
#mbox-cells = <1>;
16+
};
17+
18+
19+
* Mailbox Client
20+
21+
Required property:
22+
- mboxes: List of phandle and mailbox channel specifiers.
23+
24+
Optional property:
25+
- mbox-names: List of identifier strings for each mailbox channel
26+
required by the client. The use of this property
27+
is discouraged in favor of using index in list of
28+
'mboxes' while requesting a mailbox. Instead the
29+
platforms may define channel indices, in DT headers,
30+
to something legible.
31+
32+
Example:
33+
pwr_cntrl: power {
34+
...
35+
mbox-names = "pwr-ctrl", "rpc";
36+
mboxes = <&mailbox 0
37+
&mailbox 1>;
38+
};

‎Documentation/devicetree/bindings/net/smsc-lan91c111.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ Optional properties:
1111
are supported on the device. Valid value for SMSC LAN91c111 are
1212
1, 2 or 4. If it's omitted or invalid, the size would be 2 meaning
1313
16-bit access only.
14+
- power-gpios: GPIO to control the PWRDWN pin
15+
- reset-gpios: GPIO to control the RESET pin

‎Documentation/devicetree/bindings/pwm/pwm-fsl-ftm.txt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
Freescale FlexTimer Module (FTM) PWM controller
22

3+
The same FTM PWM device can have a different endianness on different SoCs. The
4+
device tree provides a property to describing this so that an operating system
5+
device driver can handle all variants of the device. Refer to the table below
6+
for the endianness of the FTM PWM block as integrated into the existing SoCs:
7+
8+
SoC | FTM-PWM endianness
9+
--------+-------------------
10+
Vybrid | LE
11+
LS1 | BE
12+
LS2 | LE
13+
14+
Please see ../regmap/regmap.txt for more detail about how to specify endian
15+
modes in device tree.
16+
17+
318
Required properties:
419
- compatible: Should be "fsl,vf610-ftm-pwm".
520
- reg: Physical base address and length of the controller's registers
@@ -16,7 +31,8 @@ Required properties:
1631
- pinctrl-names: Must contain a "default" entry.
1732
- pinctrl-NNN: One property must exist for each entry in pinctrl-names.
1833
See pinctrl/pinctrl-bindings.txt for details of the property values.
19-
34+
- big-endian: Boolean property, required if the FTM PWM registers use a big-
35+
endian rather than little-endian layout.
2036

2137
Example:
2238

@@ -32,4 +48,5 @@ pwm0: pwm@40038000 {
3248
<&clks VF610_CLK_FTM0_EXT_FIX_EN>;
3349
pinctrl-names = "default";
3450
pinctrl-0 = <&pinctrl_pwm0_1>;
51+
big-endian;
3552
};

‎Documentation/devicetree/bindings/pwm/pwm-rockchip.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Required properties:
77
"rockchip,vop-pwm": found integrated in VOP on RK3288 SoC
88
- reg: physical base address and length of the controller's registers
99
- clocks: phandle and clock specifier of the PWM reference clock
10-
- #pwm-cells: should be 2. See pwm.txt in this directory for a
11-
description of the cell format.
10+
- #pwm-cells: must be 2 (rk2928) or 3 (rk3288). See pwm.txt in this directory
11+
for a description of the cell format.
1212

1313
Example:
1414

‎Documentation/devicetree/bindings/sound/sgtl5000.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,20 @@ Required properties:
77

88
- clocks : the clock provider of SYS_MCLK
99

10+
- VDDA-supply : the regulator provider of VDDA
11+
12+
- VDDIO-supply: the regulator provider of VDDIO
13+
14+
Optional properties:
15+
16+
- VDDD-supply : the regulator provider of VDDD
17+
1018
Example:
1119

1220
codec: sgtl5000@0a {
1321
compatible = "fsl,sgtl5000";
1422
reg = <0x0a>;
1523
clocks = <&clks 150>;
24+
VDDA-supply = <&reg_3p3v>;
25+
VDDIO-supply = <&reg_3p3v>;
1626
};

‎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+
3) The Documentation/ portion of the patch should come in the series before
16+
the code implementing the binding.
17+
1518
II. For kernel maintainers
1619

1720
1) If you aren't comfortable reviewing a given binding, reply to it and ask

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
* Temperature Monitor (TEMPMON) on Freescale i.MX SoCs
22

33
Required properties:
4-
- compatible : "fsl,imx6q-thermal"
4+
- compatible : "fsl,imx6q-tempmon" for i.MX6Q, "fsl,imx6sx-tempmon" for i.MX6SX.
5+
i.MX6SX has two more IRQs than i.MX6Q, one is IRQ_LOW and the other is IRQ_PANIC,
6+
when temperature is below than low threshold, IRQ_LOW will be triggered, when temperature
7+
is higher than panic threshold, system will auto reboot by SRC module.
58
- fsl,tempmon : phandle pointer to system controller that contains TEMPMON
69
control registers, e.g. ANATOP on imx6q.
710
- fsl,tempmon-data : phandle pointer to fuse controller that contains TEMPMON

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Zynq Watchdog Device Tree Bindings
2+
-------------------------------------------
3+
4+
Required properties:
5+
- compatible : Should be "cdns,wdt-r1p2".
6+
- clocks : This is pclk (APB clock).
7+
- interrupts : This is wd_irq - watchdog timeout interrupt.
8+
- interrupt-parent : Must be core interrupt controller.
9+
10+
Optional properties
11+
- reset-on-timeout : If this property exists, then a reset is done
12+
when watchdog times out.
13+
- timeout-sec : Watchdog timeout value (in seconds).
14+
15+
Example:
16+
watchdog@f8005000 {
17+
compatible = "cdns,wdt-r1p2";
18+
clocks = <&clkc 45>;
19+
interrupt-parent = <&intc>;
20+
interrupts = <0 9 1>;
21+
reg = <0xf8005000 0x1000>;
22+
reset-on-timeout;
23+
timeout-sec = <10>;
24+
};

‎Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ Required properties:
77

88
Optional property:
99
- big-endian: If present the watchdog device's registers are implemented
10-
in big endian mode, otherwise in little mode.
10+
in big endian mode, otherwise in native mode(same with CPU), for more
11+
detail please see: Documentation/devicetree/bindings/regmap/regmap.txt.
1112

1213
Examples:
1314

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Meson SoCs Watchdog timer
2+
3+
Required properties:
4+
5+
- compatible : should be "amlogic,meson6-wdt"
6+
- reg : Specifies base physical address and size of the registers.
7+
8+
Example:
9+
10+
wdt: watchdog@c1109900 {
11+
compatible = "amlogic,meson6-wdt";
12+
reg = <0xc1109900 0x8>;
13+
};

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Qualcomm Krait Processor Sub-system (KPSS) Watchdog
2+
---------------------------------------------------
3+
4+
Required properties :
5+
- compatible : shall contain only one of the following:
6+
7+
"qcom,kpss-wdt-msm8960"
8+
"qcom,kpss-wdt-apq8064"
9+
"qcom,kpss-wdt-ipq8064"
10+
11+
- reg : shall contain base register location and length
12+
- clocks : shall contain the input clock
13+
14+
Optional properties :
15+
- timeout-sec : shall contain the default watchdog timeout in seconds,
16+
if unset, the default timeout is 30 seconds
17+
18+
Example:
19+
watchdog@208a038 {
20+
compatible = "qcom,kpss-wdt-ipq8064";
21+
reg = <0x0208a038 0x40>;
22+
clocks = <&sleep_clk>;
23+
timeout-sec = <10>;
24+
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Required properties:
99
(a) "samsung,s3c2410-wdt" for Exynos4 and previous SoCs
1010
(b) "samsung,exynos5250-wdt" for Exynos5250
1111
(c) "samsung,exynos5420-wdt" for Exynos5420
12+
(c) "samsung,exynos7-wdt" for Exynos7
1213

1314
- reg : base physical address of the controller and length of memory mapped
1415
region.

‎Documentation/filesystems/Locking

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ prototypes:
6767
struct file *, unsigned open_flag,
6868
umode_t create_mode, int *opened);
6969
int (*tmpfile) (struct inode *, struct dentry *, umode_t);
70+
int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
7071

7172
locking rules:
7273
all may block
@@ -96,6 +97,7 @@ fiemap: no
9697
update_time: no
9798
atomic_open: yes
9899
tmpfile: no
100+
dentry_open: no
99101

100102
Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
101103
victim.

0 commit comments

Comments
 (0)