Skip to content

Commit 061f817

Browse files
author
Ingo Molnar
committed
Merge tag 'v4.5-rc4' into ras/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents e6c8f18 + 18558ca commit 061f817

File tree

735 files changed

+6588
-56897
lines changed

Some content is hidden

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

735 files changed

+6588
-56897
lines changed

‎Documentation/cgroup-v2.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This is the authoritative documentation on the design, interface and
77
conventions of cgroup v2. It describes all userland-visible aspects
88
of cgroup including core and specific controller behaviors. All
99
future changes must be reflected in this document. Documentation for
10-
v1 is available under Documentation/cgroup-legacy/.
10+
v1 is available under Documentation/cgroup-v1/.
1111

1212
CONTENTS
1313

@@ -843,6 +843,10 @@ PAGE_SIZE multiple when read back.
843843
Amount of memory used to cache filesystem data,
844844
including tmpfs and shared memory.
845845

846+
sock
847+
848+
Amount of memory used in network transmission buffers
849+
846850
file_mapped
847851

848852
Amount of cached filesystem data mapped with mmap()

‎Documentation/devicetree/bindings/net/brcm,bcmgenet.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ethernet@f0b60000 {
6868
phy1: ethernet-phy@1 {
6969
max-speed = <1000>;
7070
reg = <0x1>;
71-
compatible = "brcm,28nm-gphy", "ethernet-phy-ieee802.3-c22";
71+
compatible = "ethernet-phy-ieee802.3-c22";
7272
};
7373
};
7474
};
@@ -115,7 +115,7 @@ ethernet@f0ba0000 {
115115
phy0: ethernet-phy@0 {
116116
max-speed = <1000>;
117117
reg = <0x0>;
118-
compatible = "brcm,bcm53125", "ethernet-phy-ieee802.3-c22";
118+
compatible = "ethernet-phy-ieee802.3-c22";
119119
};
120120
};
121121
};

‎Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ Required properties:
44
- compatible: should be "hisilicon,hns-dsaf-v1" or "hisilicon,hns-dsaf-v2".
55
"hisilicon,hns-dsaf-v1" is for hip05.
66
"hisilicon,hns-dsaf-v2" is for Hi1610 and Hi1612.
7-
- dsa-name: dsa fabric name who provide this interface.
8-
should be "dsafX", X is the dsaf id.
97
- mode: dsa fabric mode string. only support one of dsaf modes like these:
108
"2port-64vf",
119
"6port-16rss",
@@ -26,9 +24,8 @@ Required properties:
2624

2725
Example:
2826

29-
dsa: dsa@c7000000 {
27+
dsaf0: dsa@c7000000 {
3028
compatible = "hisilicon,hns-dsaf-v1";
31-
dsa_name = "dsaf0";
3229
mode = "6port-16rss";
3330
interrupt-parent = <&mbigen_dsa>;
3431
reg = <0x0 0xC0000000 0x0 0x420000

‎Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ Required properties:
44
- compatible: "hisilicon,hns-nic-v1" or "hisilicon,hns-nic-v2".
55
"hisilicon,hns-nic-v1" is for hip05.
66
"hisilicon,hns-nic-v2" is for Hi1610 and Hi1612.
7-
- ae-name: accelerator name who provides this interface,
8-
is simply a name referring to the name of name in the accelerator node.
7+
- ae-handle: accelerator engine handle for hns,
8+
specifies a reference to the associating hardware driver node.
9+
see Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt
910
- port-id: is the index of port provided by DSAF (the accelerator). DSAF can
1011
connect to 8 PHYs. Port 0 to 1 are both used for adminstration purpose. They
1112
are called debug ports.
@@ -41,7 +42,7 @@ Example:
4142

4243
ethernet@0{
4344
compatible = "hisilicon,hns-nic-v1";
44-
ae-name = "dsaf0";
45+
ae-handle = <&dsaf0>;
4546
port-id = <0>;
4647
local-mac-address = [a2 14 e4 4b 56 76];
4748
};

‎Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@ Required properties:
66
- interrupts: interrupt for the device
77
- phy: See ethernet.txt file in the same directory.
88
- phy-mode: See ethernet.txt file in the same directory
9-
- clocks: a pointer to the reference clock for this device.
9+
- clocks: List of clocks for this device. At least one clock is
10+
mandatory for the core clock. If several clocks are given, then the
11+
clock-names property must be used to identify them.
1012

1113
Optional properties:
1214
- tx-csum-limit: maximum mtu supported by port that allow TX checksum.
1315
Value is presented in bytes. If not used, by default 1600B is set for
1416
"marvell,armada-370-neta" and 9800B for others.
17+
- clock-names: List of names corresponding to clocks property; shall be
18+
"core" for core clock and "bus" for the optional bus clock.
19+
1520

1621
Example:
1722

‎Documentation/devicetree/bindings/net/mdio-mux-gpio.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ Example :
3838

3939
phy11: ethernet-phy@1 {
4040
reg = <1>;
41-
compatible = "marvell,88e1149r";
4241
marvell,reg-init = <3 0x10 0 0x5777>,
4342
<3 0x11 0 0x00aa>,
4443
<3 0x12 0 0x4105>,
@@ -48,7 +47,6 @@ Example :
4847
};
4948
phy12: ethernet-phy@2 {
5049
reg = <2>;
51-
compatible = "marvell,88e1149r";
5250
marvell,reg-init = <3 0x10 0 0x5777>,
5351
<3 0x11 0 0x00aa>,
5452
<3 0x12 0 0x4105>,
@@ -58,7 +56,6 @@ Example :
5856
};
5957
phy13: ethernet-phy@3 {
6058
reg = <3>;
61-
compatible = "marvell,88e1149r";
6259
marvell,reg-init = <3 0x10 0 0x5777>,
6360
<3 0x11 0 0x00aa>,
6461
<3 0x12 0 0x4105>,
@@ -68,7 +65,6 @@ Example :
6865
};
6966
phy14: ethernet-phy@4 {
7067
reg = <4>;
71-
compatible = "marvell,88e1149r";
7268
marvell,reg-init = <3 0x10 0 0x5777>,
7369
<3 0x11 0 0x00aa>,
7470
<3 0x12 0 0x4105>,
@@ -85,7 +81,6 @@ Example :
8581

8682
phy21: ethernet-phy@1 {
8783
reg = <1>;
88-
compatible = "marvell,88e1149r";
8984
marvell,reg-init = <3 0x10 0 0x5777>,
9085
<3 0x11 0 0x00aa>,
9186
<3 0x12 0 0x4105>,
@@ -95,7 +90,6 @@ Example :
9590
};
9691
phy22: ethernet-phy@2 {
9792
reg = <2>;
98-
compatible = "marvell,88e1149r";
9993
marvell,reg-init = <3 0x10 0 0x5777>,
10094
<3 0x11 0 0x00aa>,
10195
<3 0x12 0 0x4105>,
@@ -105,7 +99,6 @@ Example :
10599
};
106100
phy23: ethernet-phy@3 {
107101
reg = <3>;
108-
compatible = "marvell,88e1149r";
109102
marvell,reg-init = <3 0x10 0 0x5777>,
110103
<3 0x11 0 0x00aa>,
111104
<3 0x12 0 0x4105>,
@@ -115,7 +108,6 @@ Example :
115108
};
116109
phy24: ethernet-phy@4 {
117110
reg = <4>;
118-
compatible = "marvell,88e1149r";
119111
marvell,reg-init = <3 0x10 0 0x5777>,
120112
<3 0x11 0 0x00aa>,
121113
<3 0x12 0 0x4105>,

‎Documentation/devicetree/bindings/net/mdio-mux.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ Example :
4747

4848
phy11: ethernet-phy@1 {
4949
reg = <1>;
50-
compatible = "marvell,88e1149r";
5150
marvell,reg-init = <3 0x10 0 0x5777>,
5251
<3 0x11 0 0x00aa>,
5352
<3 0x12 0 0x4105>,
@@ -57,7 +56,6 @@ Example :
5756
};
5857
phy12: ethernet-phy@2 {
5958
reg = <2>;
60-
compatible = "marvell,88e1149r";
6159
marvell,reg-init = <3 0x10 0 0x5777>,
6260
<3 0x11 0 0x00aa>,
6361
<3 0x12 0 0x4105>,
@@ -67,7 +65,6 @@ Example :
6765
};
6866
phy13: ethernet-phy@3 {
6967
reg = <3>;
70-
compatible = "marvell,88e1149r";
7168
marvell,reg-init = <3 0x10 0 0x5777>,
7269
<3 0x11 0 0x00aa>,
7370
<3 0x12 0 0x4105>,
@@ -77,7 +74,6 @@ Example :
7774
};
7875
phy14: ethernet-phy@4 {
7976
reg = <4>;
80-
compatible = "marvell,88e1149r";
8177
marvell,reg-init = <3 0x10 0 0x5777>,
8278
<3 0x11 0 0x00aa>,
8379
<3 0x12 0 0x4105>,
@@ -94,7 +90,6 @@ Example :
9490

9591
phy21: ethernet-phy@1 {
9692
reg = <1>;
97-
compatible = "marvell,88e1149r";
9893
marvell,reg-init = <3 0x10 0 0x5777>,
9994
<3 0x11 0 0x00aa>,
10095
<3 0x12 0 0x4105>,
@@ -104,7 +99,6 @@ Example :
10499
};
105100
phy22: ethernet-phy@2 {
106101
reg = <2>;
107-
compatible = "marvell,88e1149r";
108102
marvell,reg-init = <3 0x10 0 0x5777>,
109103
<3 0x11 0 0x00aa>,
110104
<3 0x12 0 0x4105>,
@@ -114,7 +108,6 @@ Example :
114108
};
115109
phy23: ethernet-phy@3 {
116110
reg = <3>;
117-
compatible = "marvell,88e1149r";
118111
marvell,reg-init = <3 0x10 0 0x5777>,
119112
<3 0x11 0 0x00aa>,
120113
<3 0x12 0 0x4105>,
@@ -124,7 +117,6 @@ Example :
124117
};
125118
phy24: ethernet-phy@4 {
126119
reg = <4>;
127-
compatible = "marvell,88e1149r";
128120
marvell,reg-init = <3 0x10 0 0x5777>,
129121
<3 0x11 0 0x00aa>,
130122
<3 0x12 0 0x4105>,

‎Documentation/devicetree/bindings/net/phy.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ Optional Properties:
1717
"ethernet-phy-ieee802.3-c22" or "ethernet-phy-ieee802.3-c45" for
1818
PHYs that implement IEEE802.3 clause 22 or IEEE802.3 clause 45
1919
specifications. If neither of these are specified, the default is to
20-
assume clause 22. The compatible list may also contain other
21-
elements.
20+
assume clause 22.
2221

2322
If the phy's identifier is known then the list may contain an entry
2423
of the form: "ethernet-phy-idAAAA.BBBB" where
@@ -28,6 +27,9 @@ Optional Properties:
2827
4 hex digits. This is the chip vendor OUI bits 19:24,
2928
followed by 10 bits of a vendor specific ID.
3029

30+
The compatible list should not contain other values than those
31+
listed here.
32+
3133
- max-speed: Maximum PHY supported speed (10, 100, 1000...)
3234

3335
- broken-turn-around: If set, indicates the PHY device does not correctly

‎Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ OHCI and EHCI controllers.
88
Required properties:
99
- compatible: "renesas,pci-r8a7790" for the R8A7790 SoC;
1010
"renesas,pci-r8a7791" for the R8A7791 SoC;
11+
"renesas,pci-r8a7793" for the R8A7793 SoC;
1112
"renesas,pci-r8a7794" for the R8A7794 SoC;
1213
"renesas,pci-rcar-gen2" for a generic R-Car Gen2 compatible device
1314

‎Documentation/devicetree/bindings/pci/rcar-pci.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Required properties:
44
compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;
55
"renesas,pcie-r8a7790" for the R8A7790 SoC;
66
"renesas,pcie-r8a7791" for the R8A7791 SoC;
7+
"renesas,pcie-r8a7793" for the R8A7793 SoC;
78
"renesas,pcie-r8a7795" for the R8A7795 SoC;
89
"renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device.
910

‎Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ The compatible list for this generic sound card currently:
3030
"fsl,imx-audio-sgtl5000"
3131
(compatible with Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt)
3232

33+
"fsl,imx-audio-wm8960"
34+
3335
Required properties:
3436

3537
- compatible : Contains one of entries in the compatible list.

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

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
* Renesas R-Car Thermal
22

33
Required properties:
4-
- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal"
5-
as fallback.
4+
- compatible : "renesas,thermal-<soctype>",
5+
"renesas,rcar-gen2-thermal" (with thermal-zone) or
6+
"renesas,rcar-thermal" (without thermal-zone) as fallback.
67
Examples with soctypes are:
78
- "renesas,thermal-r8a73a4" (R-Mobile APE6)
89
- "renesas,thermal-r8a7779" (R-Car H1)
@@ -36,3 +37,35 @@ thermal@e61f0000 {
3637
0xe61f0300 0x38>;
3738
interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
3839
};
40+
41+
Example (with thermal-zone):
42+
43+
thermal-zones {
44+
cpu_thermal: cpu-thermal {
45+
polling-delay-passive = <1000>;
46+
polling-delay = <5000>;
47+
48+
thermal-sensors = <&thermal>;
49+
50+
trips {
51+
cpu-crit {
52+
temperature = <115000>;
53+
hysteresis = <0>;
54+
type = "critical";
55+
};
56+
};
57+
cooling-maps {
58+
};
59+
};
60+
};
61+
62+
thermal: thermal@e61f0000 {
63+
compatible = "renesas,thermal-r8a7790",
64+
"renesas,rcar-gen2-thermal",
65+
"renesas,rcar-thermal";
66+
reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
67+
interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
68+
clocks = <&mstp5_clks R8A7790_CLK_THERMAL>;
69+
power-domains = <&cpg_clocks>;
70+
#thermal-sensor-cells = <0>;
71+
};

‎Documentation/filesystems/proc.txt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ Table 1-2: Contents of the status files (as of 4.1)
240240
RssFile size of resident file mappings
241241
RssShmem size of resident shmem memory (includes SysV shm,
242242
mapping of tmpfs and shared anonymous mappings)
243-
VmData size of data, stack, and text segments
244-
VmStk size of data, stack, and text segments
243+
VmData size of private data segments
244+
VmStk size of stack segments
245245
VmExe size of text segment
246246
VmLib size of shared library code
247247
VmPTE size of page table entries
@@ -356,7 +356,7 @@ address perms offset dev inode pathname
356356
a7cb1000-a7cb2000 ---p 00000000 00:00 0
357357
a7cb2000-a7eb2000 rw-p 00000000 00:00 0
358358
a7eb2000-a7eb3000 ---p 00000000 00:00 0
359-
a7eb3000-a7ed5000 rw-p 00000000 00:00 0 [stack:1001]
359+
a7eb3000-a7ed5000 rw-p 00000000 00:00 0
360360
a7ed5000-a8008000 r-xp 00000000 03:00 4222 /lib/libc.so.6
361361
a8008000-a800a000 r--p 00133000 03:00 4222 /lib/libc.so.6
362362
a800a000-a800b000 rw-p 00135000 03:00 4222 /lib/libc.so.6
@@ -388,18 +388,15 @@ is not associated with a file:
388388

389389
[heap] = the heap of the program
390390
[stack] = the stack of the main process
391-
[stack:1001] = the stack of the thread with tid 1001
392391
[vdso] = the "virtual dynamic shared object",
393392
the kernel system call handler
394393

395394
or if empty, the mapping is anonymous.
396395

397396
The /proc/PID/task/TID/maps is a view of the virtual memory from the viewpoint
398397
of the individual tasks of a process. In this file you will see a mapping marked
399-
as [stack] if that task sees it as a stack. This is a key difference from the
400-
content of /proc/PID/maps, where you will see all mappings that are being used
401-
as stack by all of those tasks. Hence, for the example above, the task-level
402-
map, i.e. /proc/PID/task/TID/maps for thread 1001 will look like this:
398+
as [stack] if that task sees it as a stack. Hence, for the example above, the
399+
task-level map, i.e. /proc/PID/task/TID/maps for thread 1001 will look like this:
403400

404401
08048000-08049000 r-xp 00000000 03:00 8312 /opt/test
405402
08049000-0804a000 rw-p 00001000 03:00 8312 /opt/test

‎Documentation/kernel-parameters.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1496,6 +1496,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
14961496
could change it dynamically, usually by
14971497
/sys/module/printk/parameters/ignore_loglevel.
14981498

1499+
ignore_rlimit_data
1500+
Ignore RLIMIT_DATA setting for data mappings,
1501+
print warning at first misuse. Can be changed via
1502+
/sys/module/kernel/parameters/ignore_rlimit_data.
1503+
14991504
ihash_entries= [KNL]
15001505
Set number of hash buckets for inode cache.
15011506

@@ -4230,6 +4235,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
42304235
The default value of this parameter is determined by
42314236
the config option CONFIG_WQ_POWER_EFFICIENT_DEFAULT.
42324237

4238+
workqueue.debug_force_rr_cpu
4239+
Workqueue used to implicitly guarantee that work
4240+
items queued without explicit CPU specified are put
4241+
on the local CPU. This guarantee is no longer true
4242+
and while local CPU is still preferred work items
4243+
may be put on foreign CPUs. This debug option
4244+
forces round-robin CPU selection to flush out
4245+
usages which depend on the now broken guarantee.
4246+
When enabled, memory and cache locality will be
4247+
impacted.
4248+
42334249
x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of
42344250
default x2apic cluster mode on platforms
42354251
supporting x2apic.

‎Documentation/networking/ip-sysctl.txt

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

595595
tcp_syn_retries - INTEGER
596596
Number of times initial SYNs for an active TCP connection attempt
597-
will be retransmitted. Should not be higher than 255. Default value
597+
will be retransmitted. Should not be higher than 127. Default value
598598
is 6, which corresponds to 63seconds till the last retransmission
599599
with the current initial RTO of 1second. With this the final timeout
600600
for an active TCP connection attempt will happen after 127seconds.

0 commit comments

Comments
 (0)