Skip to content

Commit 2b95bd7

Browse files
ingomolnaringomolnar
committed
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents ffa86c2 + 69eea5a commit 2b95bd7

File tree

586 files changed

+7737
-3452
lines changed

Some content is hidden

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

586 files changed

+7737
-3452
lines changed

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,9 @@
653653
cpuidle.off=1 [CPU_IDLE]
654654
disable the cpuidle sub-system
655655

656+
cpufreq.off=1 [CPU_FREQ]
657+
disable the cpufreq sub-system
658+
656659
cpu_init_udelay=N
657660
[X86] Delay for N microsec between assert and de-assert
658661
of APIC INIT to start processors. This delay occurs
@@ -1183,6 +1186,12 @@
11831186
functions that can be changed at run time by the
11841187
set_graph_notrace file in the debugfs tracing directory.
11851188

1189+
ftrace_graph_max_depth=<uint>
1190+
[FTRACE] Used with the function graph tracer. This is
1191+
the max depth it will trace into a function. This value
1192+
can be changed at run time by the max_graph_depth file
1193+
in the tracefs tracing directory. default: 0 (no limit)
1194+
11861195
gamecon.map[2|3]=
11871196
[HW,JOY] Multisystem joystick and NES/SNES/PSX pad
11881197
support via parallel port (up to 5 devices per port)

‎Documentation/arm64/silicon-errata.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,4 @@ stable kernels.
6868
| | | | |
6969
| Qualcomm Tech. | Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 |
7070
| Qualcomm Tech. | Falkor v1 | E1009 | QCOM_FALKOR_ERRATUM_1009 |
71+
| Qualcomm Tech. | QDF2400 ITS | E0065 | QCOM_QDF2400_ERRATUM_0065 |

‎Documentation/cgroup-v2.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,16 +1142,17 @@ used by the kernel.
11421142

11431143
pids.max
11441144

1145-
A read-write single value file which exists on non-root cgroups. The
1146-
default is "max".
1145+
A read-write single value file which exists on non-root
1146+
cgroups. The default is "max".
11471147

1148-
Hard limit of number of processes.
1148+
Hard limit of number of processes.
11491149

11501150
pids.current
11511151

1152-
A read-only single value file which exists on all cgroups.
1152+
A read-only single value file which exists on all cgroups.
11531153

1154-
The number of processes currently in the cgroup and its descendants.
1154+
The number of processes currently in the cgroup and its
1155+
descendants.
11551156

11561157
Organisational operations are not blocked by cgroup policies, so it is
11571158
possible to have pids.current > pids.max. This can be done by either

‎Documentation/dev-tools/kcov.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Note that kcov does not aim to collect as much coverage as possible. It aims
1010
to collect more or less stable coverage that is function of syscall inputs.
1111
To achieve this goal it does not collect coverage in soft/hard interrupts
1212
and instrumentation of some inherently non-deterministic parts of kernel is
13-
disbled (e.g. scheduler, locking).
13+
disabled (e.g. scheduler, locking).
1414

1515
Usage
1616
-----

‎Documentation/devicetree/bindings/powerpc/4xx/emac.txt‎

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
For Axon it can be absent, though my current driver
7272
doesn't handle phy-address yet so for now, keep
7373
0x00ffffff in it.
74+
- phy-handle : Used to describe configurations where a external PHY
75+
is used. Please refer to:
76+
Documentation/devicetree/bindings/net/ethernet.txt
7477
- rx-fifo-size-gige : 1 cell, Rx fifo size in bytes for 1000 Mb/sec
7578
operations (if absent the value is the same as
7679
rx-fifo-size). For Axon, either absent or 2048.
@@ -81,8 +84,22 @@
8184
offload, phandle of the TAH device node.
8285
- tah-channel : 1 cell, optional. If appropriate, channel used on the
8386
TAH engine.
87+
- fixed-link : Fixed-link subnode describing a link to a non-MDIO
88+
managed entity. See
89+
Documentation/devicetree/bindings/net/fixed-link.txt
90+
for details.
91+
- mdio subnode : When the EMAC has a phy connected to its local
92+
mdio, which us supported by the kernel's network
93+
PHY library in drivers/net/phy, there must be device
94+
tree subnode with the following required properties:
95+
- #address-cells: Must be <1>.
96+
- #size-cells: Must be <0>.
8497

85-
Example:
98+
For PHY definitions: Please refer to
99+
Documentation/devicetree/bindings/net/phy.txt and
100+
Documentation/devicetree/bindings/net/ethernet.txt
101+
102+
Examples:
86103

87104
EMAC0: ethernet@40000800 {
88105
device_type = "network";
@@ -104,6 +121,48 @@
104121
zmii-channel = <0>;
105122
};
106123

124+
EMAC1: ethernet@ef600c00 {
125+
device_type = "network";
126+
compatible = "ibm,emac-apm821xx", "ibm,emac4sync";
127+
interrupt-parent = <&EMAC1>;
128+
interrupts = <0 1>;
129+
#interrupt-cells = <1>;
130+
#address-cells = <0>;
131+
#size-cells = <0>;
132+
interrupt-map = <0 &UIC2 0x10 IRQ_TYPE_LEVEL_HIGH /* Status */
133+
1 &UIC2 0x14 IRQ_TYPE_LEVEL_HIGH /* Wake */>;
134+
reg = <0xef600c00 0x000000c4>;
135+
local-mac-address = [000000000000]; /* Filled in by U-Boot */
136+
mal-device = <&MAL0>;
137+
mal-tx-channel = <0>;
138+
mal-rx-channel = <0>;
139+
cell-index = <0>;
140+
max-frame-size = <9000>;
141+
rx-fifo-size = <16384>;
142+
tx-fifo-size = <2048>;
143+
fifo-entry-size = <10>;
144+
phy-mode = "rgmii";
145+
phy-handle = <&phy0>;
146+
phy-map = <0x00000000>;
147+
rgmii-device = <&RGMII0>;
148+
rgmii-channel = <0>;
149+
tah-device = <&TAH0>;
150+
tah-channel = <0>;
151+
has-inverted-stacr-oc;
152+
has-new-stacr-staopc;
153+
154+
mdio {
155+
#address-cells = <1>;
156+
#size-cells = <0>;
157+
158+
phy0: ethernet-phy@0 {
159+
compatible = "ethernet-phy-ieee802.3-c22";
160+
reg = <0>;
161+
};
162+
};
163+
};
164+
165+
107166
ii) McMAL node
108167

109168
Required properties:
@@ -145,4 +204,3 @@
145204
- revision : as provided by the RGMII new version register if
146205
available.
147206
For Axon: 0x0000012a
148-

‎Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Required Properties:
4545
Optional Properties:
4646
- reg-names: In addition to the required properties, the following are optional
4747
- "efuse-address" - Contains efuse base address used to pick up ABB info.
48-
- "ldo-address" - Contains address of ABB LDO overide register address.
48+
- "ldo-address" - Contains address of ABB LDO override register.
4949
"efuse-address" is required for this.
5050
- ti,ldovbb-vset-mask - Required if ldo-address is set, mask for LDO override
5151
register to provide override vset value.

‎Documentation/devicetree/bindings/usb/usb251xb.txt‎

Lines changed: 18 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ Required properties :
77
- compatible : Should be "microchip,usb251xb" or one of the specific types:
88
"microchip,usb2512b", "microchip,usb2512bi", "microchip,usb2513b",
99
"microchip,usb2513bi", "microchip,usb2514b", "microchip,usb2514bi"
10-
- hub-reset-gpios : Should specify the gpio for hub reset
10+
- reset-gpios : Should specify the gpio for hub reset
11+
- reg : I2C address on the selected bus (default is <0x2C>)
1112

1213
Optional properties :
13-
- reg : I2C address on the selected bus (default is <0x2C>)
1414
- skip-config : Skip Hub configuration, but only send the USB-Attach command
15-
- vendor-id : USB Vendor ID of the hub (16 bit, default is 0x0424)
16-
- product-id : USB Product ID of the hub (16 bit, default depends on type)
17-
- device-id : USB Device ID of the hub (16 bit, default is 0x0bb3)
18-
- language-id : USB Language ID (16 bit, default is 0x0000)
19-
- manufacturer : USB Manufacturer string (max 31 characters long)
20-
- product : USB Product string (max 31 characters long)
21-
- serial : USB Serial string (max 31 characters long)
15+
- vendor-id : Set USB Vendor ID of the hub (16 bit, default is 0x0424)
16+
- product-id : Set USB Product ID of the hub (16 bit, default depends on type)
17+
- device-id : Set USB Device ID of the hub (16 bit, default is 0x0bb3)
18+
- language-id : Set USB Language ID (16 bit, default is 0x0000)
19+
- manufacturer : Set USB Manufacturer string (max 31 characters long)
20+
- product : Set USB Product string (max 31 characters long)
21+
- serial : Set USB Serial string (max 31 characters long)
2222
- {bus,self}-powered : selects between self- and bus-powered operation (default
2323
is self-powered)
2424
- disable-hi-speed : disable USB Hi-Speed support
@@ -31,43 +31,26 @@ Optional properties :
3131
(default is individual)
3232
- dynamic-power-switching : enable auto-switching from self- to bus-powered
3333
operation if the local power source is removed or unavailable
34-
- oc-delay-{100us,4ms,8ms,16ms} : set over current timer delay (default is 8ms)
35-
- compound-device : indicated the hub is part of a compound device
34+
- oc-delay-us : Delay time (in microseconds) for filtering the over-current
35+
sense inputs. Valid values are 100, 4000, 8000 (default) and 16000. If
36+
an invalid value is given, the default is used instead.
37+
- compound-device : indicate the hub is part of a compound device
3638
- port-mapping-mode : enable port mapping mode
3739
- string-support : enable string descriptor support (required for manufacturer,
3840
product and serial string configuration)
3941
- non-removable-ports : Should specify the ports which have a non-removable
4042
device connected.
4143
- sp-disabled-ports : Specifies the ports which will be self-power disabled
4244
- bp-disabled-ports : Specifies the ports which will be bus-power disabled
43-
- max-sp-power : Specifies the maximum current the hub consumes from an
44-
upstream port when operating as self-powered hub including the power
45-
consumption of a permanently attached peripheral if the hub is
46-
configured as a compound device. The value is given in mA in a 0 - 500
47-
range (default is 2).
48-
- max-bp-power : Specifies the maximum current the hub consumes from an
49-
upstream port when operating as bus-powered hub including the power
50-
consumption of a permanently attached peripheral if the hub is
51-
configured as a compound device. The value is given in mA in a 0 - 500
52-
range (default is 100).
53-
- max-sp-current : Specifies the maximum current the hub consumes from an
54-
upstream port when operating as self-powered hub EXCLUDING the power
55-
consumption of a permanently attached peripheral if the hub is
56-
configured as a compound device. The value is given in mA in a 0 - 500
57-
range (default is 2).
58-
- max-bp-current : Specifies the maximum current the hub consumes from an
59-
upstream port when operating as bus-powered hub EXCLUDING the power
60-
consumption of a permanently attached peripheral if the hub is
61-
configured as a compound device. The value is given in mA in a 0 - 500
62-
range (default is 100).
63-
- power-on-time : Specifies the time it takes from the time the host initiates
64-
the power-on sequence to a port until the port has adequate power. The
65-
value is given in ms in a 0 - 510 range (default is 100ms).
45+
- power-on-time-ms : Specifies the time it takes from the time the host
46+
initiates the power-on sequence to a port until the port has adequate
47+
power. The value is given in ms in a 0 - 510 range (default is 100ms).
6648

6749
Examples:
6850
usb2512b@2c {
6951
compatible = "microchip,usb2512b";
70-
hub-reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
52+
reg = <0x2c>;
53+
reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
7154
};
7255

7356
usb2514b@2c {

‎Documentation/networking/ip-sysctl.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,8 @@ accept_redirects - BOOLEAN
10061006
FALSE (router)
10071007

10081008
forwarding - BOOLEAN
1009-
Enable IP forwarding on this interface.
1009+
Enable IP forwarding on this interface. This controls whether packets
1010+
received _on_ this interface can be forwarded.
10101011

10111012
mc_forwarding - BOOLEAN
10121013
Do multicast routing. The kernel needs to be compiled with CONFIG_MROUTE

‎Documentation/virtual/kvm/api.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -951,6 +951,10 @@ This ioctl allows the user to create or modify a guest physical memory
951951
slot. When changing an existing slot, it may be moved in the guest
952952
physical memory space, or its flags may be modified. It may not be
953953
resized. Slots may not overlap in guest physical address space.
954+
Bits 0-15 of "slot" specifies the slot id and this value should be
955+
less than the maximum number of user memory slots supported per VM.
956+
The maximum allowed slots can be queried using KVM_CAP_NR_MEMSLOTS,
957+
if this capability is supported by the architecture.
954958

955959
If KVM_CAP_MULTI_ADDRESS_SPACE is available, bits 16-31 of "slot"
956960
specifies the address space which is being modified. They must be

‎Documentation/vm/userfaultfd.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,6 @@ the same read(2) protocol as for the page fault notifications. The
172172
manager has to explicitly enable these events by setting appropriate
173173
bits in uffdio_api.features passed to UFFDIO_API ioctl:
174174

175-
UFFD_FEATURE_EVENT_EXIT - enable notification about exit() of the
176-
non-cooperative process. When the monitored process exits, the uffd
177-
manager will get UFFD_EVENT_EXIT.
178-
179175
UFFD_FEATURE_EVENT_FORK - enable userfaultfd hooks for fork(). When
180176
this feature is enabled, the userfaultfd context of the parent process
181177
is duplicated into the newly created process. The manager receives

0 commit comments

Comments
 (0)