Skip to content

Commit 7369866

Browse files
palmer-dabbeltpalmer-dabbelt
committed
Merge tag 'for-riscv' of https://git.kernel.org/pub/scm/virt/kvm/kvm.git into for-next
H extension definitions, shared by the KVM and RISC-V trees. * tag 'for-riscv' of ssh://gitolite.kernel.org/pub/scm/virt/kvm/kvm: (301 commits) RISC-V: Add hypervisor extension related CSR defines KVM: selftests: Ensure all migrations are performed when test is affined KVM: x86: Swap order of CPUID entry "index" vs. "significant flag" checks ptp: Fix ptp_kvm_getcrosststamp issue for x86 ptp_kvm x86/kvmclock: Move this_cpu_pvti into kvmclock.h KVM: s390: Function documentation fixes selftests: KVM: Don't clobber XMM register when read KVM: VMX: Fix a TSX_CTRL_CPUID_CLEAR field mask issue selftests: KVM: Explicitly use movq to read xmm registers selftests: KVM: Call ucall_init when setting up in rseq_test KVM: Remove tlbs_dirty KVM: X86: Synchronize the shadow pagetable before link it KVM: X86: Fix missed remote tlb flush in rmap_write_protect() KVM: x86: nSVM: don't copy virt_ext from vmcb12 KVM: x86: nSVM: test eax for 4K alignment for GP errata workaround KVM: x86: selftests: test simultaneous uses of V_IRQ from L1 and L0 KVM: x86: nSVM: restore int_vector in svm_clear_vintr kvm: x86: Add AMD PMU MSRs to msrs_to_save_all[] KVM: x86: nVMX: re-evaluate emulation_required on nested VM exit KVM: x86: nVMX: don't fail nested VM entry on invalid guest state if !from_vmentry ...
2 parents 5d4595d + 3f2401f commit 7369866

329 files changed

Lines changed: 3911 additions & 1912 deletions

File tree

Some content is hidden

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

‎Documentation/admin-guide/README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ Configuring the kernel
259259
Compiling the kernel
260260
--------------------
261261

262-
- Make sure you have at least gcc 4.9 available.
262+
- Make sure you have at least gcc 5.1 available.
263263
For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.
264264

265265
Please note that you can still run a.out user programs with this kernel.

‎Documentation/devicetree/bindings/arm/tegra.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ properties:
5454
- const: toradex,apalis_t30
5555
- const: nvidia,tegra30
5656
- items:
57-
- const: toradex,apalis_t30-eval-v1.1
57+
- const: toradex,apalis_t30-v1.1-eval
5858
- const: toradex,apalis_t30-eval
5959
- const: toradex,apalis_t30-v1.1
6060
- const: toradex,apalis_t30

‎Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function block.
99

1010
All DISP device tree nodes must be siblings to the central MMSYS_CONFIG node.
1111
For a description of the MMSYS_CONFIG binding, see
12-
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt.
12+
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml.
1313

1414
DISP function blocks
1515
====================

‎Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ properties:
1919
- const: allwinner,sun8i-v3s-emac
2020
- const: allwinner,sun50i-a64-emac
2121
- items:
22-
- const: allwinner,sun50i-h6-emac
22+
- enum:
23+
- allwinner,sun20i-d1-emac
24+
- allwinner,sun50i-h6-emac
2325
- const: allwinner,sun50i-a64-emac
2426

2527
reg:

‎Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ufs/samsung,exynos-ufs.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Samsung SoC series UFS host controller Device Tree Bindings
8+
9+
maintainers:
10+
- Alim Akhtar <alim.akhtar@samsung.com>
11+
12+
description: |
13+
Each Samsung UFS host controller instance should have its own node.
14+
This binding define Samsung specific binding other then what is used
15+
in the common ufshcd bindings
16+
[1] Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
17+
18+
properties:
19+
20+
compatible:
21+
enum:
22+
- samsung,exynos7-ufs
23+
24+
reg:
25+
items:
26+
- description: HCI register
27+
- description: vendor specific register
28+
- description: unipro register
29+
- description: UFS protector register
30+
31+
reg-names:
32+
items:
33+
- const: hci
34+
- const: vs_hci
35+
- const: unipro
36+
- const: ufsp
37+
38+
clocks:
39+
items:
40+
- description: ufs link core clock
41+
- description: unipro main clock
42+
43+
clock-names:
44+
items:
45+
- const: core_clk
46+
- const: sclk_unipro_main
47+
48+
interrupts:
49+
maxItems: 1
50+
51+
phys:
52+
maxItems: 1
53+
54+
phy-names:
55+
const: ufs-phy
56+
57+
required:
58+
- compatible
59+
- reg
60+
- interrupts
61+
- phys
62+
- phy-names
63+
- clocks
64+
- clock-names
65+
66+
additionalProperties: false
67+
68+
examples:
69+
- |
70+
#include <dt-bindings/interrupt-controller/arm-gic.h>
71+
#include <dt-bindings/clock/exynos7-clk.h>
72+
73+
ufs: ufs@15570000 {
74+
compatible = "samsung,exynos7-ufs";
75+
reg = <0x15570000 0x100>,
76+
<0x15570100 0x100>,
77+
<0x15571000 0x200>,
78+
<0x15572000 0x300>;
79+
reg-names = "hci", "vs_hci", "unipro", "ufsp";
80+
interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>;
81+
clocks = <&clock_fsys1 ACLK_UFS20_LINK>,
82+
<&clock_fsys1 SCLK_UFSUNIPRO20_USER>;
83+
clock-names = "core_clk", "sclk_unipro_main";
84+
pinctrl-names = "default";
85+
pinctrl-0 = <&ufs_rst_n &ufs_refclk_out>;
86+
phys = <&ufs_phy>;
87+
phy-names = "ufs-phy";
88+
};
89+
...

‎Documentation/networking/dsa/sja1105.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ not available.
296296
Device Tree bindings and board design
297297
=====================================
298298

299-
This section references ``Documentation/devicetree/bindings/net/dsa/sja1105.txt``
299+
This section references ``Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml``
300300
and aims to showcase some potential switch caveats.
301301

302302
RMII PHY role and out-of-band signaling

‎Documentation/process/changes.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ you probably needn't concern yourself with pcmciautils.
2929
====================== =============== ========================================
3030
Program Minimal version Command to check the version
3131
====================== =============== ========================================
32-
GNU C 4.9 gcc --version
32+
GNU C 5.1 gcc --version
3333
Clang/LLVM (optional) 10.0.1 clang --version
3434
GNU make 3.81 make --version
3535
binutils 2.23 ld -v

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ Linux内核5.x版本 <http://kernel.org/>
223223
编译内核
224224
---------
225225

226-
- 确保您至少有gcc 4.9可用。
226+
- 确保您至少有gcc 5.1可用。
227227
有关更多信息，请参阅 :ref:`Documentation/process/changes.rst <changes>` 。
228228

229229
请注意，您仍然可以使用此内核运行a.out用户程序。

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ Linux內核5.x版本 <http://kernel.org/>
226226
編譯內核
227227
---------
228228

229-
- 確保您至少有gcc 4.9可用。
229+
- 確保您至少有gcc 5.1可用。
230230
有關更多信息，請參閱 :ref:`Documentation/process/changes.rst <changes>` 。
231231

232232
請注意，您仍然可以使用此內核運行a.out用戶程序。

‎MAINTAINERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14342,7 +14342,8 @@ F: Documentation/devicetree/bindings/pci/intel,ixp4xx-pci.yaml
1434214342
F: drivers/pci/controller/pci-ixp4xx.c
1434314343

1434414344
PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
14345-
M: Jonathan Derrick <jonathan.derrick@intel.com>
14345+
M: Nirmal Patel <nirmal.patel@linux.intel.com>
14346+
R: Jonathan Derrick <jonathan.derrick@linux.dev>
1434614347
L: linux-pci@vger.kernel.org
1434714348
S: Supported
1434814349
F: drivers/pci/controller/vmd.c

0 commit comments

Comments
 (0)