Skip to content

Commit ed2ef29

Browse files
rkrcmarrkrcmar
committed
Merge tag 'kvm-s390-master-4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
KVM: s390: Fixes for 4.19 - Fallout from the hugetlbfs support: pfmf interpretion and locking - VSIE: fix keywrapping for nested guests
2 parents 732b531 + df88f31 commit ed2ef29

File tree

243 files changed

+2248
-1652
lines changed

Some content is hidden

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

243 files changed

+2248
-1652
lines changed

‎Documentation/ABI/stable/sysfs-bus-xen-backend

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,12 @@ KernelVersion: 3.0
7373
Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
7474
Description:
7575
Number of sectors written by the frontend.
76+
77+
What: /sys/bus/xen-backend/devices/*/state
78+
Date: August 2018
79+
KernelVersion: 4.19
80+
Contact: Joe Jin <joe.jin@oracle.com>
81+
Description:
82+
The state of the device. One of: 'Unknown',
83+
'Initialising', 'Initialised', 'Connected', 'Closing',
84+
'Closed', 'Reconfiguring', 'Reconfigured'.

‎Documentation/ABI/testing/sysfs-driver-xen-blkback

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,13 @@ Description:
1515
blkback. If the frontend tries to use more than
1616
max_persistent_grants, the LRU kicks in and starts
1717
removing 5% of max_persistent_grants every 100ms.
18+
19+
What: /sys/module/xen_blkback/parameters/persistent_grant_unused_seconds
20+
Date: August 2018
21+
KernelVersion: 4.19
22+
Contact: Roger Pau Monné <roger.pau@citrix.com>
23+
Description:
24+
How long a persistent grant is allowed to remain
25+
allocated without being in use. The time is in
26+
seconds, 0 means indefinitely long.
27+
The default is 60 seconds.

‎Documentation/arm64/sve.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ prctl(PR_SVE_SET_VL, unsigned long arg)
200200
thread.
201201

202202
* Changing the vector length causes all of P0..P15, FFR and all bits of
203-
Z0..V31 except for Z0 bits [127:0] .. Z31 bits [127:0] to become
203+
Z0..Z31 except for Z0 bits [127:0] .. Z31 bits [127:0] to become
204204
unspecified. Calling PR_SVE_SET_VL with vl equal to the thread's current
205205
vector length, or calling PR_SVE_SET_VL with the PR_SVE_SET_VL_ONEXEC
206206
flag, does not constitute a change to the vector length for this purpose.
@@ -500,7 +500,7 @@ References
500500
[2] arch/arm64/include/uapi/asm/ptrace.h
501501
AArch64 Linux ptrace ABI definitions
502502

503-
[3] linux/Documentation/arm64/cpu-feature-registers.txt
503+
[3] Documentation/arm64/cpu-feature-registers.txt
504504

505505
[4] ARM IHI0055C
506506
http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055c/IHI0055C_beta_aapcs64.pdf

‎Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The RISC-V supervisor ISA manual specifies three interrupt sources that are
1111
attached to every HLIC: software interrupts, the timer interrupt, and external
1212
interrupts. Software interrupts are used to send IPIs between cores. The
1313
timer interrupt comes from an architecturally mandated real-time timer that is
14-
controller via Supervisor Binary Interface (SBI) calls and CSR reads. External
14+
controlled via Supervisor Binary Interface (SBI) calls and CSR reads. External
1515
interrupts connect all other device interrupts to the HLIC, which are routed
1616
via the platform-level interrupt controller (PLIC).
1717

@@ -25,7 +25,15 @@ in the system.
2525

2626
Required properties:
2727
- compatible : "riscv,cpu-intc"
28-
- #interrupt-cells : should be <1>
28+
- #interrupt-cells : should be <1>. The interrupt sources are defined by the
29+
RISC-V supervisor ISA manual, with only the following three interrupts being
30+
defined for supervisor mode:
31+
- Source 1 is the supervisor software interrupt, which can be sent by an SBI
32+
call and is reserved for use by software.
33+
- Source 5 is the supervisor timer interrupt, which can be configured by
34+
SBI calls and implements a one-shot timer.
35+
- Source 9 is the supervisor external interrupt, which chains to all other
36+
device interrupts.
2937
- interrupt-controller : Identifies the node as an interrupt controller
3038

3139
Furthermore, this interrupt-controller MUST be embedded inside the cpu
@@ -38,7 +46,7 @@ An example device tree entry for a HLIC is show below.
3846
...
3947
cpu1-intc: interrupt-controller {
4048
#interrupt-cells = <1>;
41-
compatible = "riscv,cpu-intc", "sifive,fu540-c000-cpu-intc";
49+
compatible = "sifive,fu540-c000-cpu-intc", "riscv,cpu-intc";
4250
interrupt-controller;
4351
};
4452
};

‎Documentation/devicetree/bindings/watchdog/renesas-wdt.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Required properties:
77
Examples with soctypes are:
88
- "renesas,r8a7743-wdt" (RZ/G1M)
99
- "renesas,r8a7745-wdt" (RZ/G1E)
10+
- "renesas,r8a774a1-wdt" (RZ/G2M)
1011
- "renesas,r8a7790-wdt" (R-Car H2)
1112
- "renesas,r8a7791-wdt" (R-Car M2-W)
1213
- "renesas,r8a7792-wdt" (R-Car V2H)
@@ -21,8 +22,8 @@ Required properties:
2122
- "renesas,r7s72100-wdt" (RZ/A1)
2223
The generic compatible string must be:
2324
- "renesas,rza-wdt" for RZ/A
24-
- "renesas,rcar-gen2-wdt" for R-Car Gen2 and RZ/G
25-
- "renesas,rcar-gen3-wdt" for R-Car Gen3
25+
- "renesas,rcar-gen2-wdt" for R-Car Gen2 and RZ/G1
26+
- "renesas,rcar-gen3-wdt" for R-Car Gen3 and RZ/G2
2627

2728
- reg : Should contain WDT registers location and length
2829
- clocks : the clock feeding the watchdog timer.

‎Documentation/hwmon/ina2xx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Supported chips:
3232
Datasheet: Publicly available at the Texas Instruments website
3333
http://www.ti.com/
3434

35-
Author: Lothar Felten <l-felten@ti.com>
35+
Author: Lothar Felten <lothar.felten@gmail.com>
3636

3737
Description
3838
-----------

‎Documentation/i2c/DMA-considerations

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,14 @@ bounce buffer. But you don't need to care about that detail, just use the
5050
returned buffer. If NULL is returned, the threshold was not met or a bounce
5151
buffer could not be allocated. Fall back to PIO in that case.
5252

53-
In any case, a buffer obtained from above needs to be released. It ensures data
54-
is copied back to the message and a potentially used bounce buffer is freed::
53+
In any case, a buffer obtained from above needs to be released. Another helper
54+
function ensures a potentially used bounce buffer is freed::
5555

56-
i2c_release_dma_safe_msg_buf(msg, dma_buf);
56+
i2c_put_dma_safe_msg_buf(dma_buf, msg, xferred);
57+
58+
The last argument 'xferred' controls if the buffer is synced back to the
59+
message or not. No syncing is needed in cases setting up DMA had an error and
60+
there was no data transferred.
5761

5862
The bounce buffer handling from the core is generic and simple. It will always
5963
allocate a new bounce buffer. If you want a more sophisticated handling (e.g.

‎MAINTAINERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8255,9 +8255,9 @@ F: drivers/ata/pata_arasan_cf.c
82558255

82568256
LIBATA PATA DRIVERS
82578257
M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
8258-
M: Jens Axboe <kernel.dk>
8258+
M: Jens Axboe <axboe@kernel.dk>
82598259
L: linux-ide@vger.kernel.org
8260-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
8260+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
82618261
S: Maintained
82628262
F: drivers/ata/pata_*.c
82638263
F: drivers/ata/ata_generic.c
@@ -8275,7 +8275,7 @@ LIBATA SATA AHCI PLATFORM devices support
82758275
M: Hans de Goede <hdegoede@redhat.com>
82768276
M: Jens Axboe <axboe@kernel.dk>
82778277
L: linux-ide@vger.kernel.org
8278-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
8278+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
82798279
S: Maintained
82808280
F: drivers/ata/ahci_platform.c
82818281
F: drivers/ata/libahci_platform.c
@@ -8291,7 +8291,7 @@ F: drivers/ata/sata_promise.*
82918291
LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
82928292
M: Jens Axboe <axboe@kernel.dk>
82938293
L: linux-ide@vger.kernel.org
8294-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
8294+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
82958295
S: Maintained
82968296
F: drivers/ata/
82978297
F: include/linux/ata.h

‎Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 4
33
PATCHLEVEL = 19
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = Merciless Moray
77

88
# *DOCUMENTATION*
@@ -807,6 +807,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
807807
# disable pointer signed / unsigned warnings in gcc 4.0
808808
KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)
809809

810+
# disable stringop warnings in gcc 8+
811+
KBUILD_CFLAGS += $(call cc-disable-warning, stringop-truncation)
812+
810813
# disable invalid "can't wrap" optimizations for signed / pointers
811814
KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow)
812815

‎arch/arm/boot/dts/am335x-osd3358-sm-red.dts

100755100644
File mode changed.

‎arch/arm/boot/dts/am4372.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@
469469
ti,hwmods = "rtc";
470470
clocks = <&clk_32768_ck>;
471471
clock-names = "int-clk";
472+
system-power-controller;
472473
status = "disabled";
473474
};
474475

‎arch/arm/boot/dts/imx23-evk.dts

Lines changed: 41 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,43 @@
1313
reg = <0x40000000 0x08000000>;
1414
};
1515

16+
reg_vddio_sd0: regulator-vddio-sd0 {
17+
compatible = "regulator-fixed";
18+
regulator-name = "vddio-sd0";
19+
regulator-min-microvolt = <3300000>;
20+
regulator-max-microvolt = <3300000>;
21+
gpio = <&gpio1 29 0>;
22+
};
23+
24+
reg_lcd_3v3: regulator-lcd-3v3 {
25+
compatible = "regulator-fixed";
26+
regulator-name = "lcd-3v3";
27+
regulator-min-microvolt = <3300000>;
28+
regulator-max-microvolt = <3300000>;
29+
gpio = <&gpio1 18 0>;
30+
enable-active-high;
31+
};
32+
33+
reg_lcd_5v: regulator-lcd-5v {
34+
compatible = "regulator-fixed";
35+
regulator-name = "lcd-5v";
36+
regulator-min-microvolt = <5000000>;
37+
regulator-max-microvolt = <5000000>;
38+
};
39+
40+
panel {
41+
compatible = "sii,43wvf1g";
42+
backlight = <&backlight_display>;
43+
dvdd-supply = <&reg_lcd_3v3>;
44+
avdd-supply = <&reg_lcd_5v>;
45+
46+
port {
47+
panel_in: endpoint {
48+
remote-endpoint = <&display_out>;
49+
};
50+
};
51+
};
52+
1653
apb@80000000 {
1754
apbh@80000000 {
1855
gpmi-nand@8000c000 {
@@ -52,31 +89,11 @@
5289
lcdif@80030000 {
5390
pinctrl-names = "default";
5491
pinctrl-0 = <&lcdif_24bit_pins_a>;
55-
lcd-supply = <&reg_lcd_3v3>;
56-
display = <&display0>;
5792
status = "okay";
5893

59-
display0: display0 {
60-
bits-per-pixel = <32>;
61-
bus-width = <24>;
62-
63-
display-timings {
64-
native-mode = <&timing0>;
65-
timing0: timing0 {
66-
clock-frequency = <9200000>;
67-
hactive = <480>;
68-
vactive = <272>;
69-
hback-porch = <15>;
70-
hfront-porch = <8>;
71-
vback-porch = <12>;
72-
vfront-porch = <4>;
73-
hsync-len = <1>;
74-
vsync-len = <1>;
75-
hsync-active = <0>;
76-
vsync-active = <0>;
77-
de-active = <1>;
78-
pixelclk-active = <0>;
79-
};
94+
port {
95+
display_out: endpoint {
96+
remote-endpoint = <&panel_in>;
8097
};
8198
};
8299
};
@@ -118,32 +135,7 @@
118135
};
119136
};
120137

121-
regulators {
122-
compatible = "simple-bus";
123-
#address-cells = <1>;
124-
#size-cells = <0>;
125-
126-
reg_vddio_sd0: regulator@0 {
127-
compatible = "regulator-fixed";
128-
reg = <0>;
129-
regulator-name = "vddio-sd0";
130-
regulator-min-microvolt = <3300000>;
131-
regulator-max-microvolt = <3300000>;
132-
gpio = <&gpio1 29 0>;
133-
};
134-
135-
reg_lcd_3v3: regulator@1 {
136-
compatible = "regulator-fixed";
137-
reg = <1>;
138-
regulator-name = "lcd-3v3";
139-
regulator-min-microvolt = <3300000>;
140-
regulator-max-microvolt = <3300000>;
141-
gpio = <&gpio1 18 0>;
142-
enable-active-high;
143-
};
144-
};
145-
146-
backlight {
138+
backlight_display: backlight {
147139
compatible = "pwm-backlight";
148140
pwms = <&pwm 2 5000000>;
149141
brightness-levels = <0 4 8 16 32 64 128 255>;

0 commit comments

Comments
 (0)