Skip to content

Commit bd2dba1

Browse files
jlahtine-inteljlahtine-intel
committed
Merge drm/drm-next into drm-intel-next-queued
To facilitate merging topic/hdr-formats from Maarten. Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
2 parents 26eeea1 + 4b057e7 commit bd2dba1

File tree

382 files changed

+3354
-2180
lines changed

Some content is hidden

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

382 files changed

+3354
-2180
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/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/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/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.

‎Documentation/process/applying-patches.rst

Lines changed: 61 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,14 @@ You can use the ``interdiff`` program (http://cyberelk.net/tim/patchutils/) to
216216
generate a patch representing the differences between two patches and then
217217
apply the result.
218218

219-
This will let you move from something like 4.7.2 to 4.7.3 in a single
219+
This will let you move from something like 5.7.2 to 5.7.3 in a single
220220
step. The -z flag to interdiff will even let you feed it patches in gzip or
221221
bzip2 compressed form directly without the use of zcat or bzcat or manual
222222
decompression.
223223

224-
Here's how you'd go from 4.7.2 to 4.7.3 in a single step::
224+
Here's how you'd go from 5.7.2 to 5.7.3 in a single step::
225225

226-
interdiff -z ../patch-4.7.2.gz ../patch-4.7.3.gz | patch -p1
226+
interdiff -z ../patch-5.7.2.gz ../patch-5.7.3.gz | patch -p1
227227

228228
Although interdiff may save you a step or two you are generally advised to
229229
do the additional steps since interdiff can get things wrong in some cases.
@@ -245,86 +245,91 @@ The patches are available at http://kernel.org/
245245
Most recent patches are linked from the front page, but they also have
246246
specific homes.
247247

248-
The 4.x.y (-stable) and 4.x patches live at
248+
The 5.x.y (-stable) and 5.x patches live at
249249

250-
https://www.kernel.org/pub/linux/kernel/v4.x/
250+
https://www.kernel.org/pub/linux/kernel/v5.x/
251251

252-
The -rc patches live at
252+
The -rc patches are not stored on the webserver but are generated on
253+
demand from git tags such as
253254

254-
https://www.kernel.org/pub/linux/kernel/v4.x/testing/
255+
https://git.kernel.org/torvalds/p/v5.1-rc1/v5.0
255256

257+
The stable -rc patches live at
256258

257-
The 4.x kernels
259+
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/
260+
261+
262+
The 5.x kernels
258263
===============
259264

260265
These are the base stable releases released by Linus. The highest numbered
261266
release is the most recent.
262267

263268
If regressions or other serious flaws are found, then a -stable fix patch
264-
will be released (see below) on top of this base. Once a new 4.x base
269+
will be released (see below) on top of this base. Once a new 5.x base
265270
kernel is released, a patch is made available that is a delta between the
266-
previous 4.x kernel and the new one.
271+
previous 5.x kernel and the new one.
267272

268-
To apply a patch moving from 4.6 to 4.7, you'd do the following (note
269-
that such patches do **NOT** apply on top of 4.x.y kernels but on top of the
270-
base 4.x kernel -- if you need to move from 4.x.y to 4.x+1 you need to
271-
first revert the 4.x.y patch).
273+
To apply a patch moving from 5.6 to 5.7, you'd do the following (note
274+
that such patches do **NOT** apply on top of 5.x.y kernels but on top of the
275+
base 5.x kernel -- if you need to move from 5.x.y to 5.x+1 you need to
276+
first revert the 5.x.y patch).
272277

273278
Here are some examples::
274279

275-
# moving from 4.6 to 4.7
280+
# moving from 5.6 to 5.7
276281

277-
$ cd ~/linux-4.6 # change to kernel source dir
278-
$ patch -p1 < ../patch-4.7 # apply the 4.7 patch
282+
$ cd ~/linux-5.6 # change to kernel source dir
283+
$ patch -p1 < ../patch-5.7 # apply the 5.7 patch
279284
$ cd ..
280-
$ mv linux-4.6 linux-4.7 # rename source dir
285+
$ mv linux-5.6 linux-5.7 # rename source dir
281286

282-
# moving from 4.6.1 to 4.7
287+
# moving from 5.6.1 to 5.7
283288

284-
$ cd ~/linux-4.6.1 # change to kernel source dir
285-
$ patch -p1 -R < ../patch-4.6.1 # revert the 4.6.1 patch
286-
# source dir is now 4.6
287-
$ patch -p1 < ../patch-4.7 # apply new 4.7 patch
289+
$ cd ~/linux-5.6.1 # change to kernel source dir
290+
$ patch -p1 -R < ../patch-5.6.1 # revert the 5.6.1 patch
291+
# source dir is now 5.6
292+
$ patch -p1 < ../patch-5.7 # apply new 5.7 patch
288293
$ cd ..
289-
$ mv linux-4.6.1 linux-4.7 # rename source dir
294+
$ mv linux-5.6.1 linux-5.7 # rename source dir
290295

291296

292-
The 4.x.y kernels
297+
The 5.x.y kernels
293298
=================
294299

295300
Kernels with 3-digit versions are -stable kernels. They contain small(ish)
296301
critical fixes for security problems or significant regressions discovered
297-
in a given 4.x kernel.
302+
in a given 5.x kernel.
298303

299304
This is the recommended branch for users who want the most recent stable
300305
kernel and are not interested in helping test development/experimental
301306
versions.
302307

303-
If no 4.x.y kernel is available, then the highest numbered 4.x kernel is
308+
If no 5.x.y kernel is available, then the highest numbered 5.x kernel is
304309
the current stable kernel.
305310

306311
.. note::
307312

308313
The -stable team usually do make incremental patches available as well
309314
as patches against the latest mainline release, but I only cover the
310315
non-incremental ones below. The incremental ones can be found at
311-
https://www.kernel.org/pub/linux/kernel/v4.x/incr/
316+
https://www.kernel.org/pub/linux/kernel/v5.x/incr/
312317

313-
These patches are not incremental, meaning that for example the 4.7.3
314-
patch does not apply on top of the 4.7.2 kernel source, but rather on top
315-
of the base 4.7 kernel source.
318+
These patches are not incremental, meaning that for example the 5.7.3
319+
patch does not apply on top of the 5.7.2 kernel source, but rather on top
320+
of the base 5.7 kernel source.
316321

317-
So, in order to apply the 4.7.3 patch to your existing 4.7.2 kernel
318-
source you have to first back out the 4.7.2 patch (so you are left with a
319-
base 4.7 kernel source) and then apply the new 4.7.3 patch.
322+
So, in order to apply the 5.7.3 patch to your existing 5.7.2 kernel
323+
source you have to first back out the 5.7.2 patch (so you are left with a
324+
base 5.7 kernel source) and then apply the new 5.7.3 patch.
320325

321326
Here's a small example::
322327

323-
$ cd ~/linux-4.7.2 # change to the kernel source dir
324-
$ patch -p1 -R < ../patch-4.7.2 # revert the 4.7.2 patch
325-
$ patch -p1 < ../patch-4.7.3 # apply the new 4.7.3 patch
328+
$ cd ~/linux-5.7.2 # change to the kernel source dir
329+
$ patch -p1 -R < ../patch-5.7.2 # revert the 5.7.2 patch
330+
$ patch -p1 < ../patch-5.7.3 # apply the new 5.7.3 patch
326331
$ cd ..
327-
$ mv linux-4.7.2 linux-4.7.3 # rename the kernel source dir
332+
$ mv linux-5.7.2 linux-5.7.3 # rename the kernel source dir
328333

329334
The -rc kernels
330335
===============
@@ -343,38 +348,38 @@ This is a good branch to run for people who want to help out testing
343348
development kernels but do not want to run some of the really experimental
344349
stuff (such people should see the sections about -next and -mm kernels below).
345350

346-
The -rc patches are not incremental, they apply to a base 4.x kernel, just
347-
like the 4.x.y patches described above. The kernel version before the -rcN
351+
The -rc patches are not incremental, they apply to a base 5.x kernel, just
352+
like the 5.x.y patches described above. The kernel version before the -rcN
348353
suffix denotes the version of the kernel that this -rc kernel will eventually
349354
turn into.
350355

351-
So, 4.8-rc5 means that this is the fifth release candidate for the 4.8
352-
kernel and the patch should be applied on top of the 4.7 kernel source.
356+
So, 5.8-rc5 means that this is the fifth release candidate for the 5.8
357+
kernel and the patch should be applied on top of the 5.7 kernel source.
353358

354359
Here are 3 examples of how to apply these patches::
355360

356-
# first an example of moving from 4.7 to 4.8-rc3
361+
# first an example of moving from 5.7 to 5.8-rc3
357362

358-
$ cd ~/linux-4.7 # change to the 4.7 source dir
359-
$ patch -p1 < ../patch-4.8-rc3 # apply the 4.8-rc3 patch
363+
$ cd ~/linux-5.7 # change to the 5.7 source dir
364+
$ patch -p1 < ../patch-5.8-rc3 # apply the 5.8-rc3 patch
360365
$ cd ..
361-
$ mv linux-4.7 linux-4.8-rc3 # rename the source dir
366+
$ mv linux-5.7 linux-5.8-rc3 # rename the source dir
362367

363-
# now let's move from 4.8-rc3 to 4.8-rc5
368+
# now let's move from 5.8-rc3 to 5.8-rc5
364369

365-
$ cd ~/linux-4.8-rc3 # change to the 4.8-rc3 dir
366-
$ patch -p1 -R < ../patch-4.8-rc3 # revert the 4.8-rc3 patch
367-
$ patch -p1 < ../patch-4.8-rc5 # apply the new 4.8-rc5 patch
370+
$ cd ~/linux-5.8-rc3 # change to the 5.8-rc3 dir
371+
$ patch -p1 -R < ../patch-5.8-rc3 # revert the 5.8-rc3 patch
372+
$ patch -p1 < ../patch-5.8-rc5 # apply the new 5.8-rc5 patch
368373
$ cd ..
369-
$ mv linux-4.8-rc3 linux-4.8-rc5 # rename the source dir
374+
$ mv linux-5.8-rc3 linux-5.8-rc5 # rename the source dir
370375

371-
# finally let's try and move from 4.7.3 to 4.8-rc5
376+
# finally let's try and move from 5.7.3 to 5.8-rc5
372377

373-
$ cd ~/linux-4.7.3 # change to the kernel source dir
374-
$ patch -p1 -R < ../patch-4.7.3 # revert the 4.7.3 patch
375-
$ patch -p1 < ../patch-4.8-rc5 # apply new 4.8-rc5 patch
378+
$ cd ~/linux-5.7.3 # change to the kernel source dir
379+
$ patch -p1 -R < ../patch-5.7.3 # revert the 5.7.3 patch
380+
$ patch -p1 < ../patch-5.8-rc5 # apply new 5.8-rc5 patch
376381
$ cd ..
377-
$ mv linux-4.7.3 linux-4.8-rc5 # rename the kernel source dir
382+
$ mv linux-5.7.3 linux-5.8-rc5 # rename the kernel source dir
378383

379384

380385
The -mm patches and the linux-next tree

‎Documentation/translations/it_IT/admin-guide/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
.. _it_readme:
66

7-
Rilascio del kernel Linux 4.x <http://kernel.org/>
7+
Rilascio del kernel Linux 5.x <http://kernel.org/>
88
===================================================
99

1010
.. warning::

0 commit comments

Comments
 (0)