Skip to content

Commit 777d062

Browse files
committed
Merge branch 'errata/tx2-219' into for-next/fixes
Workaround for Cavium/Marvell ThunderX2 erratum #219. * errata/tx2-219: arm64: Allow CAVIUM_TX2_ERRATUM_219 to be selected arm64: Avoid Cavium TX2 erratum 219 when switching TTBR arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT arm64: KVM: Trap VM ops when ARM64_WORKAROUND_CAVIUM_TX2_219_TVM is set
2 parents 597399d + 603afdc commit 777d062

File tree

298 files changed

+2755
-1802
lines changed

Some content is hidden

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

298 files changed

+2755
-1802
lines changed

Documentation/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ stable kernels.
107107
+----------------+-----------------+-----------------+-----------------------------+
108108
| Cavium | ThunderX2 SMMUv3| #126 | N/A |
109109
+----------------+-----------------+-----------------+-----------------------------+
110+
| Cavium | ThunderX2 Core | #219 | CAVIUM_TX2_ERRATUM_219 |
111+
+----------------+-----------------+-----------------+-----------------------------+
110112
+----------------+-----------------+-----------------+-----------------------------+
111113
| Freescale/NXP | LS2080A/LS1043A | A-008585 | FSL_ERRATUM_A008585 |
112114
+----------------+-----------------+-----------------+-----------------------------+

Documentation/devicetree/bindings/dsp/fsl,dsp.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,5 @@ examples:
8585
<&pd IMX_SC_R_DSP_RAM>;
8686
mbox-names = "txdb0", "txdb1", "rxdb0", "rxdb1";
8787
mboxes = <&lsio_mu13 2 0>, <&lsio_mu13 2 1>, <&lsio_mu13 3 0>, <&lsio_mu13 3 1>;
88+
memory-region = <&dsp_reserved>;
8889
};

Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,9 @@ properties:
4343

4444
dvdd-supply:
4545
description: DVdd voltage supply
46-
items:
47-
- const: dvdd
4846

4947
avdd-supply:
5048
description: AVdd voltage supply
51-
items:
52-
- const: avdd
5349

5450
adi,rejection-60-Hz-enable:
5551
description: |
@@ -99,6 +95,9 @@ required:
9995
examples:
10096
- |
10197
spi0 {
98+
#address-cells = <1>;
99+
#size-cells = <0>;
100+
102101
adc@0 {
103102
compatible = "adi,ad7192";
104103
reg = <0>;

Documentation/devicetree/bindings/media/rc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ properties:
7373
- rc-genius-tvgo-a11mce
7474
- rc-gotview7135
7575
- rc-hauppauge
76-
- rc-hauppauge
7776
- rc-hisi-poplar
7877
- rc-hisi-tv-demo
7978
- rc-imon-mce

Documentation/devicetree/bindings/phy/lantiq,vrx200-pcie-phy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ properties:
3737
- description: exclusive PHY reset line
3838
- description: shared reset line between the PCIe PHY and PCIe controller
3939

40-
resets-names:
40+
reset-names:
4141
items:
4242
- const: phy
4343
- const: pcie

Documentation/kbuild/makefiles.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -954,11 +954,6 @@ When kbuild executes, the following steps are followed (roughly):
954954

955955
From commandline LDFLAGS_MODULE shall be used (see kbuild.txt).
956956

957-
KBUILD_ARFLAGS Options for $(AR) when creating archives
958-
959-
$(KBUILD_ARFLAGS) set by the top level Makefile to "D" (deterministic
960-
mode) if this option is supported by $(AR).
961-
962957
KBUILD_LDS
963958

964959
The linker script with full path. Assigned by the top-level Makefile.

Documentation/kbuild/modules.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,10 +498,11 @@ build.
498498
will be written containing all exported symbols that were not
499499
defined in the kernel.
500500

501-
--- 6.3 Symbols From Another External Module
501+
6.3 Symbols From Another External Module
502+
----------------------------------------
502503

503504
Sometimes, an external module uses exported symbols from
504-
another external module. kbuild needs to have full knowledge of
505+
another external module. Kbuild needs to have full knowledge of
505506
all symbols to avoid spitting out warnings about undefined
506507
symbols. Three solutions exist for this situation.
507508

@@ -521,7 +522,7 @@ build.
521522
The top-level kbuild file would then look like::
522523

523524
#./Kbuild (or ./Makefile):
524-
obj-y := foo/ bar/
525+
obj-m := foo/ bar/
525526

526527
And executing::
527528

Documentation/kbuild/reproducible-builds.rst

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,21 @@ the kernel may be unreproducible, and how to avoid them.
1616
Timestamps
1717
----------
1818

19-
The kernel embeds a timestamp in two places:
19+
The kernel embeds timestamps in three places:
2020

2121
* The version string exposed by ``uname()`` and included in
2222
``/proc/version``
2323

2424
* File timestamps in the embedded initramfs
2525

26-
By default the timestamp is the current time. This must be overridden
27-
using the `KBUILD_BUILD_TIMESTAMP`_ variable. If you are building
28-
from a git commit, you could use its commit date.
26+
* If enabled via ``CONFIG_IKHEADERS``, file timestamps of kernel
27+
headers embedded in the kernel or respective module,
28+
exposed via ``/sys/kernel/kheaders.tar.xz``
29+
30+
By default the timestamp is the current time and in the case of
31+
``kheaders`` the various files' modification times. This must
32+
be overridden using the `KBUILD_BUILD_TIMESTAMP`_ variable.
33+
If you are building from a git commit, you could use its commit date.
2934

3035
The kernel does *not* use the ``__DATE__`` and ``__TIME__`` macros,
3136
and enables warnings if they are used. If you incorporate external

Documentation/networking/device_drivers/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Contents:
2323
intel/ice
2424
google/gve
2525
mellanox/mlx5
26+
netronome/nfp
2627
pensando/ionic
2728

2829
.. only:: subproject and html

Documentation/networking/j1939.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ supported flags are:
272272
* MSG_DONTWAIT, i.e. non-blocking operation.
273273

274274
recvmsg(2)
275-
^^^^^^^^^
275+
^^^^^^^^^^
276276

277277
In most cases recvmsg(2) is needed if you want to extract more information than
278278
recvfrom(2) can provide. For example package priority and timestamp. The

0 commit comments

Comments
 (0)