Skip to content

Commit 9ed8f1a

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 43f4e62 + 7d762d6 commit 9ed8f1a

File tree

756 files changed

+7346
-3904
lines changed

Some content is hidden

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

756 files changed

+7346
-3904
lines changed

‎CREDITS

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -842,10 +842,9 @@ D: ax25-utils maintainer.
842842

843843
N: Helge Deller
844844
E: deller@gmx.de
845-
E: hdeller@redhat.de
846-
D: PA-RISC Linux hacker, LASI-, ASP-, WAX-, LCD/LED-driver
847-
S: Schimmelsrain 1
848-
S: D-69231 Rauenberg
845+
W: http://www.parisc-linux.org/
846+
D: PA-RISC Linux architecture maintainer
847+
D: LASI-, ASP-, WAX-, LCD/LED-driver
849848
S: Germany
850849

851850
N: Jean Delvare
@@ -1361,7 +1360,7 @@ S: Stellenbosch, Western Cape
13611360
S: South Africa
13621361

13631362
N: Grant Grundler
1364-
E: grundler@parisc-linux.org
1363+
E: grantgrundler@gmail.com
13651364
W: http://obmouse.sourceforge.net/
13661365
W: http://www.parisc-linux.org/
13671366
D: obmouse - rewrote Olivier Florent's Omnibook 600 "pop-up" mouse driver
@@ -2492,7 +2491,7 @@ S: Syracuse, New York 13206
24922491
S: USA
24932492

24942493
N: Kyle McMartin
2495-
E: kyle@parisc-linux.org
2494+
E: kyle@mcmartin.ca
24962495
D: Linux/PARISC hacker
24972496
D: AD1889 sound driver
24982497
S: Ottawa, Canada
@@ -3780,14 +3779,13 @@ S: 21513 Conradia Ct
37803779
S: Cupertino, CA 95014
37813780
S: USA
37823781

3783-
N: Thibaut Varene
3784-
E: T-Bone@parisc-linux.org
3785-
W: http://www.parisc-linux.org/~varenet/
3786-
P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063
3782+
N: Thibaut Varène
3783+
E: hacks+kernel@slashdirt.org
3784+
W: http://hacks.slashdirt.org/
37873785
D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits
37883786
D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there
37893787
D: AD1889 sound driver
3790-
S: Paris, France
3788+
S: France
37913789

37923790
N: Heikki Vatiainen
37933791
E: hessu@cs.tut.fi

‎Documentation/ABI/stable/sysfs-driver-mlxreg-io

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
2424
cpld3_version
2525

2626
Date: November 2018
27-
KernelVersion: 4.21
27+
KernelVersion: 5.0
2828
Contact: Vadim Pasternak <vadimpmellanox.com>
2929
Description: These files show with which CPLD versions have been burned
3030
on LED board.
@@ -35,7 +35,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
3535
jtag_enable
3636

3737
Date: November 2018
38-
KernelVersion: 4.21
38+
KernelVersion: 5.0
3939
Contact: Vadim Pasternak <vadimpmellanox.com>
4040
Description: These files enable and disable the access to the JTAG domain.
4141
By default access to the JTAG domain is disabled.
@@ -105,7 +105,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
105105
reset_voltmon_upgrade_fail
106106

107107
Date: November 2018
108-
KernelVersion: 4.21
108+
KernelVersion: 5.0
109109
Contact: Vadim Pasternak <vadimpmellanox.com>
110110
Description: These files show the system reset cause, as following: ComEx
111111
power fail, reset from ComEx, system platform reset, reset

‎Documentation/admin-guide/README.rst

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.. _readme:
22

3-
Linux kernel release 4.x <http://kernel.org/>
3+
Linux kernel release 5.x <http://kernel.org/>
44
=============================================
55

6-
These are the release notes for Linux version 4. Read them carefully,
6+
These are the release notes for Linux version 5. Read them carefully,
77
as they tell you what this is all about, explain how to install the
88
kernel, and what to do if something goes wrong.
99

@@ -63,7 +63,7 @@ Installing the kernel source
6363
directory where you have permissions (e.g. your home directory) and
6464
unpack it::
6565

66-
xz -cd linux-4.X.tar.xz | tar xvf -
66+
xz -cd linux-5.x.tar.xz | tar xvf -
6767

6868
Replace "X" with the version number of the latest kernel.
6969

@@ -72,26 +72,26 @@ Installing the kernel source
7272
files. They should match the library, and not get messed up by
7373
whatever the kernel-du-jour happens to be.
7474

75-
- You can also upgrade between 4.x releases by patching. Patches are
75+
- You can also upgrade between 5.x releases by patching. Patches are
7676
distributed in the xz format. To install by patching, get all the
7777
newer patch files, enter the top level directory of the kernel source
78-
(linux-4.X) and execute::
78+
(linux-5.x) and execute::
7979

80-
xz -cd ../patch-4.x.xz | patch -p1
80+
xz -cd ../patch-5.x.xz | patch -p1
8181

82-
Replace "x" for all versions bigger than the version "X" of your current
82+
Replace "x" for all versions bigger than the version "x" of your current
8383
source tree, **in_order**, and you should be ok. You may want to remove
8484
the backup files (some-file-name~ or some-file-name.orig), and make sure
8585
that there are no failed patches (some-file-name# or some-file-name.rej).
8686
If there are, either you or I have made a mistake.
8787

88-
Unlike patches for the 4.x kernels, patches for the 4.x.y kernels
88+
Unlike patches for the 5.x kernels, patches for the 5.x.y kernels
8989
(also known as the -stable kernels) are not incremental but instead apply
90-
directly to the base 4.x kernel. For example, if your base kernel is 4.0
91-
and you want to apply the 4.0.3 patch, you must not first apply the 4.0.1
92-
and 4.0.2 patches. Similarly, if you are running kernel version 4.0.2 and
93-
want to jump to 4.0.3, you must first reverse the 4.0.2 patch (that is,
94-
patch -R) **before** applying the 4.0.3 patch. You can read more on this in
90+
directly to the base 5.x kernel. For example, if your base kernel is 5.0
91+
and you want to apply the 5.0.3 patch, you must not first apply the 5.0.1
92+
and 5.0.2 patches. Similarly, if you are running kernel version 5.0.2 and
93+
want to jump to 5.0.3, you must first reverse the 5.0.2 patch (that is,
94+
patch -R) **before** applying the 5.0.3 patch. You can read more on this in
9595
:ref:`Documentation/process/applying-patches.rst <applying_patches>`.
9696

9797
Alternatively, the script patch-kernel can be used to automate this
@@ -114,7 +114,7 @@ Installing the kernel source
114114
Software requirements
115115
---------------------
116116

117-
Compiling and running the 4.x kernels requires up-to-date
117+
Compiling and running the 5.x kernels requires up-to-date
118118
versions of various software packages. Consult
119119
:ref:`Documentation/process/changes.rst <changes>` for the minimum version numbers
120120
required and how to get updates for these packages. Beware that using
@@ -132,12 +132,12 @@ Build directory for the kernel
132132
place for the output files (including .config).
133133
Example::
134134

135-
kernel source code: /usr/src/linux-4.X
135+
kernel source code: /usr/src/linux-5.x
136136
build directory: /home/name/build/kernel
137137

138138
To configure and build the kernel, use::
139139

140-
cd /usr/src/linux-4.X
140+
cd /usr/src/linux-5.x
141141
make O=/home/name/build/kernel menuconfig
142142
make O=/home/name/build/kernel
143143
sudo make O=/home/name/build/kernel modules_install install

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1696,12 +1696,11 @@
16961696
By default, super page will be supported if Intel IOMMU
16971697
has the capability. With this option, super page will
16981698
not be supported.
1699-
sm_off [Default Off]
1700-
By default, scalable mode will be supported if the
1699+
sm_on [Default Off]
1700+
By default, scalable mode will be disabled even if the
17011701
hardware advertises that it has support for the scalable
17021702
mode translation. With this option set, scalable mode
1703-
will not be used even on hardware which claims to support
1704-
it.
1703+
will be used on hardware which claims to support it.
17051704
tboot_noforce [Default Off]
17061705
Do not force the Intel IOMMU enabled under tboot.
17071706
By default, tboot will force Intel IOMMU on, which

‎Documentation/networking/dsa/dsa.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -533,16 +533,12 @@ Bridge VLAN filtering
533533
function that the driver has to call for each VLAN the given port is a member
534534
of. A switchdev object is used to carry the VID and bridge flags.
535535

536-
- port_fdb_prepare: bridge layer function invoked when the bridge prepares the
537-
installation of a Forwarding Database entry. If the operation is not
538-
supported, this function should return -EOPNOTSUPP to inform the bridge code
539-
to fallback to a software implementation. No hardware setup must be done in
540-
this function. See port_fdb_add for this and details.
541-
542536
- port_fdb_add: bridge layer function invoked when the bridge wants to install a
543537
Forwarding Database entry, the switch hardware should be programmed with the
544538
specified address in the specified VLAN Id in the forwarding database
545-
associated with this VLAN ID
539+
associated with this VLAN ID. If the operation is not supported, this
540+
function should return -EOPNOTSUPP to inform the bridge code to fallback to
541+
a software implementation.
546542

547543
Note: VLAN ID 0 corresponds to the port private database, which, in the context
548544
of DSA, would be the its port-based VLAN, used by the associated bridge device.

‎Documentation/networking/msg_zerocopy.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Intro
77
=====
88

99
The MSG_ZEROCOPY flag enables copy avoidance for socket send calls.
10-
The feature is currently implemented for TCP sockets.
10+
The feature is currently implemented for TCP and UDP sockets.
1111

1212

1313
Opportunity and Caveats

‎Documentation/networking/operstates.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ and changeable from userspace under certain rules.
2222
2. Querying from userspace
2323

2424
Both admin and operational state can be queried via the netlink
25-
operation RTM_GETLINK. It is also possible to subscribe to RTMGRP_LINK
26-
to be notified of updates. This is important for setting from userspace.
25+
operation RTM_GETLINK. It is also possible to subscribe to RTNLGRP_LINK
26+
to be notified of updates while the interface is admin up. This is
27+
important for setting from userspace.
2728

2829
These values contain interface state:
2930

@@ -101,8 +102,9 @@ because some driver controlled protocol establishment has to
101102
complete. Corresponding functions are netif_dormant_on() to set the
102103
flag, netif_dormant_off() to clear it and netif_dormant() to query.
103104

104-
On device allocation, networking core sets the flags equivalent to
105-
netif_carrier_ok() and !netif_dormant().
105+
On device allocation, both flags __LINK_STATE_NOCARRIER and
106+
__LINK_STATE_DORMANT are cleared, so the effective state is equivalent
107+
to netif_carrier_ok() and !netif_dormant().
106108

107109

108110
Whenever the driver CHANGES one of these flags, a workqueue event is
@@ -133,11 +135,11 @@ netif_carrier_ok() && !netif_dormant() is set by the
133135
driver. Afterwards, the userspace application can set IFLA_OPERSTATE
134136
to IF_OPER_DORMANT or IF_OPER_UP as long as the driver does not set
135137
netif_carrier_off() or netif_dormant_on(). Changes made by userspace
136-
are multicasted on the netlink group RTMGRP_LINK.
138+
are multicasted on the netlink group RTNLGRP_LINK.
137139

138140
So basically a 802.1X supplicant interacts with the kernel like this:
139141

140-
-subscribe to RTMGRP_LINK
142+
-subscribe to RTNLGRP_LINK
141143
-set IFLA_LINKMODE to 1 via RTM_SETLINK
142144
-query RTM_GETLINK once to get initial state
143145
-if initial flags are not (IFF_LOWER_UP && !IFF_DORMANT), wait until

‎Documentation/networking/switchdev.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ device.
9292
Switch ID
9393
^^^^^^^^^
9494

95-
The switchdev driver must implement the switchdev op switchdev_port_attr_get
96-
for SWITCHDEV_ATTR_ID_PORT_PARENT_ID for each port netdev, returning the same
97-
physical ID for each port of a switch. The ID must be unique between switches
98-
on the same system. The ID does not need to be unique between switches on
99-
different systems.
95+
The switchdev driver must implement the net_device operation
96+
ndo_get_port_parent_id for each port netdev, returning the same physical ID for
97+
each port of a switch. The ID must be unique between switches on the same
98+
system. The ID does not need to be unique between switches on different
99+
systems.
100100

101101
The switch ID is used to locate ports on a switch and to know if aggregated
102102
ports belong to the same switch.

0 commit comments

Comments
 (0)