Skip to content

Commit d72cf8f

Browse files
bonzinibonzini
committed
Merge tag 'kvm-s390-master-6.1-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
A PCI allocation fix and a PV clock fix.
2 parents 556f3c9 + b6662e3 commit d72cf8f

File tree

251 files changed

+3474
-1718
lines changed

Some content is hidden

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

251 files changed

+3474
-1718
lines changed

‎Documentation/arm64/cpu-feature-registers.rst

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ operation if the source belongs to the supported system register space.
9292

9393
The infrastructure emulates only the following system register space::
9494

95-
Op0=3, Op1=0, CRn=0, CRm=0,4,5,6,7
95+
Op0=3, Op1=0, CRn=0, CRm=0,2,3,4,5,6,7
9696

9797
(See Table C5-6 'System instruction encodings for non-Debug System
9898
register accesses' in ARMv8 ARM DDI 0487A.h, for the list of
@@ -293,6 +293,42 @@ infrastructure:
293293
| WFXT | [3-0] | y |
294294
+------------------------------+---------+---------+
295295

296+
10) MVFR0_EL1 - AArch32 Media and VFP Feature Register 0
297+
298+
+------------------------------+---------+---------+
299+
| Name | bits | visible |
300+
+------------------------------+---------+---------+
301+
| FPDP | [11-8] | y |
302+
+------------------------------+---------+---------+
303+
304+
11) MVFR1_EL1 - AArch32 Media and VFP Feature Register 1
305+
306+
+------------------------------+---------+---------+
307+
| Name | bits | visible |
308+
+------------------------------+---------+---------+
309+
| SIMDFMAC | [31-28] | y |
310+
+------------------------------+---------+---------+
311+
| SIMDSP | [19-16] | y |
312+
+------------------------------+---------+---------+
313+
| SIMDInt | [15-12] | y |
314+
+------------------------------+---------+---------+
315+
| SIMDLS | [11-8] | y |
316+
+------------------------------+---------+---------+
317+
318+
12) ID_ISAR5_EL1 - AArch32 Instruction Set Attribute Register 5
319+
320+
+------------------------------+---------+---------+
321+
| Name | bits | visible |
322+
+------------------------------+---------+---------+
323+
| CRC32 | [19-16] | y |
324+
+------------------------------+---------+---------+
325+
| SHA2 | [15-12] | y |
326+
+------------------------------+---------+---------+
327+
| SHA1 | [11-8] | y |
328+
+------------------------------+---------+---------+
329+
| AES | [7-4] | y |
330+
+------------------------------+---------+---------+
331+
296332

297333
Appendix I: Example
298334
-------------------

‎Documentation/devicetree/bindings/power/fsl,imx-gpcv2.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ properties:
8181

8282
power-supply: true
8383

84+
power-domains:
85+
maxItems: 1
86+
8487
resets:
8588
description: |
8689
A number of phandles to resets that need to be asserted during

‎Documentation/driver-api/driver-model/devres.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ GPIO
279279
devm_gpio_request_one()
280280

281281
I2C
282+
devm_i2c_add_adapter()
282283
devm_i2c_new_dummy_device()
283284

284285
IIO

‎Documentation/kbuild/reproducible-builds.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,16 @@ To avoid this, you can make the vDSO different for different
119119
kernel versions by including an arbitrary string of "salt" in it.
120120
This is specified by the Kconfig symbol ``CONFIG_BUILD_SALT``.
121121

122+
Git
123+
---
124+
125+
Uncommitted changes or different commit ids in git can also lead
126+
to different compilation results. For example, after executing
127+
``git reset HEAD^``, even if the code is the same, the
128+
``include/config/kernel.release`` generated during compilation
129+
will be different, which will eventually lead to binary differences.
130+
See ``scripts/setlocalversion`` for details.
131+
122132
.. _KBUILD_BUILD_TIMESTAMP: kbuild.html#kbuild-build-timestamp
123133
.. _KBUILD_BUILD_USER and KBUILD_BUILD_HOST: kbuild.html#kbuild-build-user-kbuild-build-host
124134
.. _KCFLAGS: kbuild.html#kcflags

‎Documentation/virt/kvm/devices/vm.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ KVM_S390_VM_TOD_EXT).
215215
:Parameters: address of a buffer in user space to store the data (u8) to
216216
:Returns: -EFAULT if the given address is not accessible from kernel space;
217217
-EINVAL if setting the TOD clock extension to != 0 is not supported
218+
-EOPNOTSUPP for a PV guest (TOD managed by the ultravisor)
218219

219220
3.2. ATTRIBUTE: KVM_S390_VM_TOD_LOW
220221
-----------------------------------
@@ -224,6 +225,7 @@ the POP (u64).
224225

225226
:Parameters: address of a buffer in user space to store the data (u64) to
226227
:Returns: -EFAULT if the given address is not accessible from kernel space
228+
-EOPNOTSUPP for a PV guest (TOD managed by the ultravisor)
227229

228230
3.3. ATTRIBUTE: KVM_S390_VM_TOD_EXT
229231
-----------------------------------
@@ -237,6 +239,7 @@ it, it is stored as 0 and not allowed to be set to a value != 0.
237239
(kvm_s390_vm_tod_clock) to
238240
:Returns: -EFAULT if the given address is not accessible from kernel space;
239241
-EINVAL if setting the TOD clock extension to != 0 is not supported
242+
-EOPNOTSUPP for a PV guest (TOD managed by the ultravisor)
240243

241244
4. GROUP: KVM_S390_VM_CRYPTO
242245
============================

‎MAINTAINERS

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3984,7 +3984,7 @@ M: Rafał Miłecki <rafal@milecki.pl>
39843984
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
39853985
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
39863986
S: Maintained
3987-
T: git git://github.com/broadcom/stblinux.git
3987+
T: git https://github.com/broadcom/stblinux.git
39883988
F: Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
39893989
F: arch/arm64/boot/dts/broadcom/bcmbca/*
39903990
N: bcmbca
@@ -4009,7 +4009,7 @@ R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
40094009
L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
40104010
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
40114011
S: Maintained
4012-
T: git git://github.com/broadcom/stblinux.git
4012+
T: git https://github.com/broadcom/stblinux.git
40134013
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
40144014
F: drivers/pci/controller/pcie-brcmstb.c
40154015
F: drivers/staging/vc04_services
@@ -4023,7 +4023,7 @@ M: Ray Jui <rjui@broadcom.com>
40234023
M: Scott Branden <sbranden@broadcom.com>
40244024
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
40254025
S: Maintained
4026-
T: git git://github.com/broadcom/mach-bcm
4026+
T: git https://github.com/broadcom/mach-bcm
40274027
F: arch/arm/mach-bcm/
40284028
N: bcm281*
40294029
N: bcm113*
@@ -4088,7 +4088,7 @@ M: Florian Fainelli <f.fainelli@gmail.com>
40884088
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
40894089
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
40904090
S: Maintained
4091-
T: git git://github.com/broadcom/stblinux.git
4091+
T: git https://github.com/broadcom/stblinux.git
40924092
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
40934093
F: arch/arm/boot/dts/bcm7*.dts*
40944094
F: arch/arm/include/asm/hardware/cache-b15-rac.h
@@ -4121,7 +4121,7 @@ M: Florian Fainelli <f.fainelli@gmail.com>
41214121
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
41224122
L: linux-mips@vger.kernel.org
41234123
S: Maintained
4124-
T: git git://github.com/broadcom/stblinux.git
4124+
T: git https://github.com/broadcom/stblinux.git
41254125
F: arch/mips/bmips/*
41264126
F: arch/mips/boot/dts/brcm/bcm*.dts*
41274127
F: arch/mips/include/asm/mach-bmips/*
@@ -4262,7 +4262,7 @@ M: Scott Branden <sbranden@broadcom.com>
42624262
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
42634263
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
42644264
S: Maintained
4265-
T: git git://github.com/broadcom/stblinux.git
4265+
T: git https://github.com/broadcom/stblinux.git
42664266
F: arch/arm64/boot/dts/broadcom/northstar2/*
42674267
F: arch/arm64/boot/dts/broadcom/stingray/*
42684268
F: drivers/clk/bcm/clk-ns*
@@ -4332,7 +4332,7 @@ M: Florian Fainelli <f.fainelli@gmail.com>
43324332
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
43334333
L: linux-pm@vger.kernel.org
43344334
S: Maintained
4335-
T: git git://github.com/broadcom/stblinux.git
4335+
T: git https://github.com/broadcom/stblinux.git
43364336
F: drivers/soc/bcm/bcm63xx/bcm-pmb.c
43374337
F: include/dt-bindings/soc/bcm-pmb.h
43384338

@@ -5041,7 +5041,7 @@ F: drivers/scsi/snic/
50415041

50425042
CISCO VIC ETHERNET NIC DRIVER
50435043
M: Christian Benvenuti <benve@cisco.com>
5044-
M: Govindarajulu Varadarajan <_govind@gmx.com>
5044+
M: Satish Kharat <satishkh@cisco.com>
50455045
S: Supported
50465046
F: drivers/net/ethernet/cisco/enic/
50475047

@@ -9217,7 +9217,7 @@ W: https://www.hisilicon.com
92179217
F: drivers/i2c/busses/i2c-hisi.c
92189218

92199219
HISILICON LPC BUS DRIVER
9220-
M: john.garry@huawei.com
9220+
M: Jay Fang <f.fangjian@huawei.com>
92219221
S: Maintained
92229222
W: http://www.hisilicon.com
92239223
F: Documentation/devicetree/bindings/arm/hisilicon/low-pin-count.yaml
@@ -9778,7 +9778,10 @@ S: Supported
97789778
F: drivers/pci/hotplug/rpaphp*
97799779

97809780
IBM Power SRIOV Virtual NIC Device Driver
9781-
M: Dany Madden <drt@linux.ibm.com>
9781+
M: Haren Myneni <haren@linux.ibm.com>
9782+
M: Rick Lindsley <ricklind@linux.ibm.com>
9783+
R: Nick Child <nnac123@linux.ibm.com>
9784+
R: Dany Madden <danymadden@us.ibm.com>
97829785
R: Thomas Falcon <tlfalcon@linux.ibm.com>
97839786
L: netdev@vger.kernel.org
97849787
S: Supported

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 1
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc3
5+
EXTRAVERSION = -rc4
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*
@@ -1218,7 +1218,7 @@ quiet_cmd_ar_vmlinux.a = AR $@
12181218
cmd_ar_vmlinux.a = \
12191219
rm -f $@; \
12201220
$(AR) cDPrST $@ $(KBUILD_VMLINUX_OBJS); \
1221-
$(AR) mPiT $$($(AR) t $@ | head -n1) $@ $$($(AR) t $@ | grep -F --file=$(srctree)/scripts/head-object-list.txt)
1221+
$(AR) mPiT $$($(AR) t $@ | sed -n 1p) $@ $$($(AR) t $@ | grep -F -f $(srctree)/scripts/head-object-list.txt)
12221222

12231223
targets += vmlinux.a
12241224
vmlinux.a: $(KBUILD_VMLINUX_OBJS) scripts/head-object-list.txt autoksyms_recursive FORCE

‎arch/arm/boot/dts/imx6q-yapp4-crux.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
status = "okay";
3434
};
3535

36+
&reg_pu {
37+
regulator-always-on;
38+
};
39+
3640
&reg_usb_h1_vbus {
3741
status = "okay";
3842
};

‎arch/arm/boot/dts/imx6qdl-gw5910.dtsi

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

3030
user-pb {
3131
label = "user_pb";
32-
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
32+
gpios = <&gsc_gpio 2 GPIO_ACTIVE_LOW>;
3333
linux,code = <BTN_0>;
3434
};
3535

‎arch/arm/boot/dts/imx6qdl-gw5913.dtsi

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

2727
user-pb {
2828
label = "user_pb";
29-
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
29+
gpios = <&gsc_gpio 2 GPIO_ACTIVE_LOW>;
3030
linux,code = <BTN_0>;
3131
};
3232

0 commit comments

Comments
 (0)