Skip to content

Commit f49dcd1

Browse files
author
Ingo Molnar
committed
Merge tag 'v5.3-rc7' into x86/platform, to refresh the branch
Signed-off-by: Ingo Molnar <[email protected]>
2 parents 00452ba + 089cf7f commit f49dcd1

File tree

592 files changed

+5906
-3030
lines changed

Some content is hidden

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

592 files changed

+5906
-3030
lines changed

.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ Dengcheng Zhu <[email protected]> <[email protected]>
6464
6565
6666
Dmitry Eremin-Solenikov <[email protected]>
67+
68+
69+
6770
Domen Puncer <[email protected]>
6871
Douglas Gilbert <[email protected]>
6972
Ed L. Cashin <[email protected]>
@@ -160,6 +163,8 @@ Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]
160163
161164
162165
166+
167+
163168
Mayuresh Janorkar <[email protected]>
164169
Michael Buesch <[email protected]>
165170
Michel Dänzer <[email protected]>

Documentation/PCI/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Linux PCI Bus Subsystem
99
:numbered:
1010

1111
pci
12-
picebus-howto
12+
pciebus-howto
1313
pci-iov-howto
1414
msi-howto
1515
acpi-info

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4090,6 +4090,13 @@
40904090
Run specified binary instead of /init from the ramdisk,
40914091
used for early userspace startup. See initrd.
40924092

4093+
rdrand= [X86]
4094+
force - Override the decision by the kernel to hide the
4095+
advertisement of RDRAND support (this affects
4096+
certain AMD processors because of buggy BIOS
4097+
support, specifically around the suspend/resume
4098+
path).
4099+
40934100
rdt= [HW,X86,RDT]
40944101
Turn on/off individual RDT features. List is:
40954102
cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp,

Documentation/admin-guide/sysctl/net.rst

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ Table : Subdirectories in /proc/sys/net
3939
802 E802 protocol ax25 AX25
4040
ethernet Ethernet protocol rose X.25 PLP layer
4141
ipv4 IP version 4 x25 X.25 protocol
42-
ipx IPX token-ring IBM token ring
4342
bridge Bridging decnet DEC net
4443
ipv6 IP version 6 tipc TIPC
4544
========= =================== = ========== ==================
@@ -401,33 +400,7 @@ interface.
401400
(network) that the route leads to, the router (may be directly connected), the
402401
route flags, and the device the route is using.
403402

404-
405-
5. IPX
406-
------
407-
408-
The IPX protocol has no tunable values in proc/sys/net.
409-
410-
The IPX protocol does, however, provide proc/net/ipx. This lists each IPX
411-
socket giving the local and remote addresses in Novell format (that is
412-
network:node:port). In accordance with the strange Novell tradition,
413-
everything but the port is in hex. Not_Connected is displayed for sockets that
414-
are not tied to a specific remote address. The Tx and Rx queue sizes indicate
415-
the number of bytes pending for transmission and reception. The state
416-
indicates the state the socket is in and the uid is the owning uid of the
417-
socket.
418-
419-
The /proc/net/ipx_interface file lists all IPX interfaces. For each interface
420-
it gives the network number, the node number, and indicates if the network is
421-
the primary network. It also indicates which device it is bound to (or
422-
Internal for internal networks) and the Frame Type if appropriate. Linux
423-
supports 802.3, 802.2, 802.2 SNAP and DIX (Blue Book) ethernet framing for
424-
IPX.
425-
426-
The /proc/net/ipx_route table holds a list of IPX routes. For each route it
427-
gives the destination network, the router node (or Directly) and the network
428-
address of the router (or Connected) for internal networks.
429-
430-
6. TIPC
403+
5. TIPC
431404
-------
432405

433406
tipc_rmem

Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
11
* ARC-HS Interrupt Distribution Unit
22

3-
This optional 2nd level interrupt controller can be used in SMP configurations for
4-
dynamic IRQ routing, load balancing of common/external IRQs towards core intc.
3+
This optional 2nd level interrupt controller can be used in SMP configurations
4+
for dynamic IRQ routing, load balancing of common/external IRQs towards core
5+
intc.
56

67
Properties:
78

89
- compatible: "snps,archs-idu-intc"
910
- interrupt-controller: This is an interrupt controller.
10-
- #interrupt-cells: Must be <1>.
11-
12-
Value of the cell specifies the "common" IRQ from peripheral to IDU. Number N
13-
of the particular interrupt line of IDU corresponds to the line N+24 of the
14-
core interrupt controller.
15-
16-
intc accessed via the special ARC AUX register interface, hence "reg" property
17-
is not specified.
11+
- #interrupt-cells: Must be <1> or <2>.
12+
13+
Value of the first cell specifies the "common" IRQ from peripheral to IDU.
14+
Number N of the particular interrupt line of IDU corresponds to the line N+24
15+
of the core interrupt controller.
16+
17+
The (optional) second cell specifies any of the following flags:
18+
- bits[3:0] trigger type and level flags
19+
1 = low-to-high edge triggered
20+
2 = NOT SUPPORTED (high-to-low edge triggered)
21+
4 = active high level-sensitive <<< DEFAULT
22+
8 = NOT SUPPORTED (active low level-sensitive)
23+
When no second cell is specified, the interrupt is assumed to be level
24+
sensitive.
25+
26+
The interrupt controller is accessed via the special ARC AUX register
27+
interface, hence "reg" property is not specified.
1828

1929
Example:
2030
core_intc: core-interrupt-controller {

Documentation/devicetree/bindings/net/dsa/ksz.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Required properties:
1212
- "microchip,ksz8565"
1313
- "microchip,ksz9893"
1414
- "microchip,ksz9563"
15+
- "microchip,ksz8563"
1516

1617
Optional properties:
1718

Documentation/devicetree/bindings/net/macb.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Required properties:
1515
Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
1616
Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.
1717
Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.
18-
Use "sifive,fu540-macb" for SiFive FU540-C000 SoC.
18+
Use "sifive,fu540-c000-gem" for SiFive FU540-C000 SoC.
1919
Or the generic form: "cdns,emac".
2020
- reg: Address and length of the register set for the device
21-
For "sifive,fu540-macb", second range is required to specify the
21+
For "sifive,fu540-c000-gem", second range is required to specify the
2222
address and length of the registers for GEMGXL Management block.
2323
- interrupts: Should contain macb interrupt
2424
- phy-mode: See ethernet.txt file in the same directory.

Documentation/networking/tls-offload.rst

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -506,21 +506,3 @@ Drivers should ignore the changes to TLS the device feature flags.
506506
These flags will be acted upon accordingly by the core ``ktls`` code.
507507
TLS device feature flags only control adding of new TLS connection
508508
offloads, old connections will remain active after flags are cleared.
509-
510-
Known bugs
511-
==========
512-
513-
skb_orphan() leaks clear text
514-
-----------------------------
515-
516-
Currently drivers depend on the :c:member:`sk` member of
517-
:c:type:`struct sk_buff <sk_buff>` to identify segments requiring
518-
encryption. Any operation which removes or does not preserve the socket
519-
association such as :c:func:`skb_orphan` or :c:func:`skb_clone`
520-
will cause the driver to miss the packets and lead to clear text leaks.
521-
522-
Redirects leak clear text
523-
-------------------------
524-
525-
In the RX direction, if segment has already been decrypted by the device
526-
and it gets redirected or mirrored - clear text will be transmitted out.

Documentation/networking/tuntap.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ Ethernet device, which instead of receiving packets from a physical
204204
media, receives them from user space program and instead of sending
205205
packets via physical media sends them to the user space program.
206206

207-
Let's say that you configured IPX on the tap0, then whenever
208-
the kernel sends an IPX packet to tap0, it is passed to the application
207+
Let's say that you configured IPv6 on the tap0, then whenever
208+
the kernel sends an IPv6 packet to tap0, it is passed to the application
209209
(VTun for example). The application encrypts, compresses and sends it to
210210
the other side over TCP or UDP. The application on the other side decompresses
211211
and decrypts the data received and writes the packet to the TAP device,

0 commit comments

Comments
 (0)