Skip to content

Commit e855e80

Browse files
author
Ingo Molnar
committed
Merge tag 'v5.12-rc5' into WIP.x86/core, to pick up recent NOP related changes
In particular we want to have this upstream commit: b908297: ("bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG") ... before merging in x86/cpu changes and the removal of the NOP optimizations, and applying PeterZ's !retpoline objtool series. Signed-off-by: Ingo Molnar <[email protected]>
2 parents f2ac256 + a5e13c6 commit e855e80

File tree

783 files changed

+6214
-3449
lines changed

Some content is hidden

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

783 files changed

+6214
-3449
lines changed

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Andrew Morton <[email protected]>
3636
3737
3838
Andrew Vasquez <[email protected]>
39+
3940
4041
4142
Andy Adamson <[email protected]>
@@ -65,6 +66,8 @@ Changbin Du <[email protected]> <[email protected]>
6566
6667
6768
69+
70+
6871
Christophe Ricard <[email protected]>
6972
Christoph Hellwig <[email protected]>
7073
Corey Minyard <[email protected]>

Documentation/ABI/testing/sysfs-fs-xfs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Contact: [email protected]
3333
Description:
3434
The current state of the log write grant head. It
3535
represents the total log reservation of all currently
36-
oustanding transactions, including regrants due to
36+
outstanding transactions, including regrants due to
3737
rolling transactions. The grant head is exported in
3838
"cycle:bytes" format.
3939
Users: xfstests

Documentation/arm64/acpi_object_usage.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ For ACPI on arm64, tables also fall into the following categories:
1717

1818
- Recommended: BERT, EINJ, ERST, HEST, PCCT, SSDT
1919

20-
- Optional: BGRT, CPEP, CSRT, DBG2, DRTM, ECDT, FACS, FPDT, IORT,
21-
MCHI, MPST, MSCT, NFIT, PMTT, RASF, SBST, SLIT, SPMI, SRAT, STAO,
22-
TCPA, TPM2, UEFI, XENV
20+
- Optional: BGRT, CPEP, CSRT, DBG2, DRTM, ECDT, FACS, FPDT, IBFT,
21+
IORT, MCHI, MPST, MSCT, NFIT, PMTT, RASF, SBST, SLIT, SPMI, SRAT,
22+
STAO, TCPA, TPM2, UEFI, XENV
2323

24-
- Not supported: BOOT, DBGP, DMAR, ETDT, HPET, IBFT, IVRS, LPIT,
25-
MSDM, OEMx, PSDT, RSDT, SLIC, WAET, WDAT, WDRT, WPBT
24+
- Not supported: BOOT, DBGP, DMAR, ETDT, HPET, IVRS, LPIT, MSDM, OEMx,
25+
PSDT, RSDT, SLIC, WAET, WDAT, WDRT, WPBT
2626

2727
====== ========================================================================
2828
Table Usage for ARMv8 Linux

Documentation/arm64/silicon-errata.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ stable kernels.
130130
| Marvell | ARM-MMU-500 | #582743 | N/A |
131131
+----------------+-----------------+-----------------+-----------------------------+
132132
+----------------+-----------------+-----------------+-----------------------------+
133+
| NVIDIA | Carmel Core | N/A | NVIDIA_CARMEL_CNP_ERRATUM |
134+
+----------------+-----------------+-----------------+-----------------------------+
135+
+----------------+-----------------+-----------------+-----------------------------+
133136
| Freescale/NXP | LS2080A/LS1043A | A-008585 | FSL_ERRATUM_A008585 |
134137
+----------------+-----------------+-----------------+-----------------------------+
135138
+----------------+-----------------+-----------------+-----------------------------+

Documentation/devicetree/bindings/sound/fsl,spdif.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ properties:
2121
- fsl,vf610-spdif
2222
- fsl,imx6sx-spdif
2323
- fsl,imx8qm-spdif
24+
- fsl,imx8qxp-spdif
25+
- fsl,imx8mq-spdif
26+
- fsl,imx8mm-spdif
27+
- fsl,imx8mn-spdif
2428

2529
reg:
2630
maxItems: 1

Documentation/networking/device_drivers/ethernet/amazon/ena.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ DATA PATH
267267
Tx
268268
--
269269

270-
end_start_xmit() is called by the stack. This function does the following:
270+
ena_start_xmit() is called by the stack. This function does the following:
271271

272272
- Maps data buffers (skb->data and frags).
273273
- Populates ena_buf for the push buffer (if the driver and device are

Documentation/networking/devlink/devlink-dpipe.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ purposes as a standard complementary tool. The system's view from
5252
``devlink-dpipe`` should change according to the changes done by the
5353
standard configuration tools.
5454

55-
For example, it’s quiet common to implement Access Control Lists (ACL)
55+
For example, it’s quite common to implement Access Control Lists (ACL)
5656
using Ternary Content Addressable Memory (TCAM). The TCAM memory can be
5757
divided into TCAM regions. Complex TC filters can have multiple rules with
5858
different priorities and different lookup keys. On the other hand hardware

Documentation/networking/devlink/devlink-port.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ representor netdevice.
151151
-------------
152152
A subfunction devlink port is created but it is not active yet. That means the
153153
entities are created on devlink side, the e-switch port representor is created,
154-
but the subfunction device itself it not created. A user might use e-switch port
154+
but the subfunction device itself is not created. A user might use e-switch port
155155
representor to do settings, putting it into bridge, adding TC rules, etc. A user
156156
might as well configure the hardware address (such as MAC address) of the
157157
subfunction while subfunction is inactive.
@@ -173,7 +173,7 @@ Terms and Definitions
173173
* - Term
174174
- Definitions
175175
* - ``PCI device``
176-
- A physical PCI device having one or more PCI bus consists of one or
176+
- A physical PCI device having one or more PCI buses consists of one or
177177
more PCI controllers.
178178
* - ``PCI controller``
179179
- A controller consists of potentially multiple physical functions,

Documentation/networking/xfrm_device.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Callbacks to implement
5050

5151
The NIC driver offering ipsec offload will need to implement these
5252
callbacks to make the offload available to the network stack's
53-
XFRM subsytem. Additionally, the feature bits NETIF_F_HW_ESP and
53+
XFRM subsystem. Additionally, the feature bits NETIF_F_HW_ESP and
5454
NETIF_F_HW_ESP_TX_CSUM will signal the availability of the offload.
5555

5656

Documentation/virt/kvm/api.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,7 +1495,8 @@ Fails if any VCPU has already been created.
14951495

14961496
Define which vcpu is the Bootstrap Processor (BSP). Values are the same
14971497
as the vcpu id in KVM_CREATE_VCPU. If this ioctl is not called, the default
1498-
is vcpu 0.
1498+
is vcpu 0. This ioctl has to be called before vcpu creation,
1499+
otherwise it will return EBUSY error.
14991500

15001501

15011502
4.42 KVM_GET_XSAVE
@@ -4806,8 +4807,10 @@ If an MSR access is not permitted through the filtering, it generates a
48064807
allows user space to deflect and potentially handle various MSR accesses
48074808
into user space.
48084809

4809-
If a vCPU is in running state while this ioctl is invoked, the vCPU may
4810-
experience inconsistent filtering behavior on MSR accesses.
4810+
Note, invoking this ioctl with a vCPU is running is inherently racy. However,
4811+
KVM does guarantee that vCPUs will see either the previous filter or the new
4812+
filter, e.g. MSRs with identical settings in both the old and new filter will
4813+
have deterministic behavior.
48114814

48124815
4.127 KVM_XEN_HVM_SET_ATTR
48134816
--------------------------

0 commit comments

Comments
 (0)