Merge remote-tracking branch 'origin/f29' into f29-user-thl-vanilla-fedora

12 files changed, 47 insertions, 54 deletions

diff --git a/0001-drm-nouveau-register-backlight-on-pascal-and-newer.patch b/0001-drm-nouveau-register-backlight-on-pascal-and-newer.patch
new file mode 100644
index 000000000..6fa486952
--- /dev/null
+++ b/0001-drm-nouveau-register-backlight-on-pascal-and-newer.patch
@@ -0,0 +1,26 @@
+From 15f77c4ade3364106a3a397f0a8d6fce9d6a6326 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs@redhat.com>
+Date: Fri, 11 Jan 2019 16:08:20 +1000
+Subject: [PATCH] drm/nouveau: register backlight on pascal and newer
+
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+---
+ drivers/gpu/drm/nouveau/nouveau_backlight.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
+index 5f5be6368aed..c7a94c94dbf3 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
++++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
+@@ -253,6 +253,8 @@ nouveau_backlight_init(struct drm_connector *connector)
+ 	case NV_DEVICE_INFO_V0_FERMI:
+ 	case NV_DEVICE_INFO_V0_KEPLER:
+ 	case NV_DEVICE_INFO_V0_MAXWELL:
++	case NV_DEVICE_INFO_V0_PASCAL:
++	case NV_DEVICE_INFO_V0_VOLTA:
+ 		ret = nv50_backlight_init(nv_encoder, &props, &ops);
+ 		break;
+ 	default:
+-- 
+2.20.1
+
diff --git a/CVE-2019-3701.patch b/CVE-2019-3701.patch
deleted file mode 100644
index 06ee36a63..000000000
--- a/CVE-2019-3701.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From linux-netdev  Thu Jan 03 12:26:34 2019
-From: Oliver Hartkopp <socketcan () hartkopp ! net>
-Date: Thu, 03 Jan 2019 12:26:34 +0000
-To: linux-netdev
-Subject: [PATCH] can: gw: ensure DLC boundaries after CAN frame modification
-Message-Id: <20190103122634.2530-1-socketcan () hartkopp ! net>
-X-MARC-Message: https://marc.info/?l=linux-netdev&m=154651842302479
-
-The CAN frame modification rules allow bitwise logical operations which can
-be also applied to the can_dlc field. Ensure the manipulation result to
-maintain the can_dlc boundaries so that the CAN drivers do not accidently
-write arbitrary content beyond the data registers in the CAN controllers
-I/O mem when processing can-gw manipulated outgoing frames. When passing these
-frames to user space this issue did not have any effect to the kernel or any
-leaked data as we always strictly copy sizeof(struct can_frame) bytes.
-
-Reported-by: Muyu Yu <ieatmuttonchuan@gmail.com>
-Reported-by: Marcus Meissner <meissner@suse.de>
-Tested-by: Muyu Yu <ieatmuttonchuan@gmail.com>
-Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
-Cc: linux-stable <stable@vger.kernel.org> # >= v3.2
----
- net/can/gw.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/net/can/gw.c b/net/can/gw.c
-index faa3da88a127..9000d9b8a133 100644
---- a/net/can/gw.c
-+++ b/net/can/gw.c
-@@ -418,6 +418,10 @@ static void can_can_gw_rcv(struct sk_buff *skb, void *data)
- 
- 	/* check for checksum updates when the CAN frame has been modified */
- 	if (modidx) {
-+		/* ensure DLC boundaries after the different mods */
-+		if (cf->can_dlc > 8)
-+			cf->can_dlc = 8;
-+
- 		if (gwj->mod.csumfunc.crc8)
- 			(*gwj->mod.csumfunc.crc8)(cf, &gwj->mod.csum.crc8);
- 
--- 
-2.19.2
diff --git a/configs/fedora/generic/arm/CONFIG_88EU_AP_MODE b/configs/fedora/generic/arm/CONFIG_88EU_AP_MODE
new file mode 100644
index 000000000..8ba98fbe9
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_88EU_AP_MODE
@@ -0,0 +1 @@
+CONFIG_88EU_AP_MODE=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_R8188EU b/configs/fedora/generic/arm/CONFIG_R8188EU
index ed7c3546e..ed7c3546e 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_R8188EU
+++ b/configs/fedora/generic/arm/CONFIG_R8188EU
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_88EU_AP_MODE b/configs/fedora/generic/arm/armv7/CONFIG_88EU_AP_MODE
deleted file mode 100644
index 55fc5ec1e..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_88EU_AP_MODE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_88EU_AP_MODE is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index eb9300839..fa6dab204 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -24,6 +24,7 @@ CONFIG_8139TOO_8129=y
 CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_88EU_AP_MODE=y
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FS_POSIX_ACL=y
@@ -4639,7 +4640,7 @@ CONFIG_QUOTA=y
 CONFIG_R3964=m
 CONFIG_R6040=m
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 4de4d6924..08fbdda85 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -24,6 +24,7 @@ CONFIG_8139TOO_8129=y
 CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_88EU_AP_MODE=y
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FS_POSIX_ACL=y
@@ -4617,7 +4618,7 @@ CONFIG_QUOTA=y
 CONFIG_R3964=m
 CONFIG_R6040=m
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 47e9c3d83..d746bdca5 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -23,7 +23,7 @@ CONFIG_8139TOO_8129=y
 CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_88EU_AP_MODE is not set
+CONFIG_88EU_AP_MODE=y
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FS_POSIX_ACL=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index cc9164784..d4564b82c 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -23,7 +23,7 @@ CONFIG_8139TOO_8129=y
 CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_88EU_AP_MODE is not set
+CONFIG_88EU_AP_MODE=y
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FS_POSIX_ACL=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 41f1dcf82..068f65f01 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -23,7 +23,7 @@ CONFIG_8139TOO_8129=y
 CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_88EU_AP_MODE is not set
+CONFIG_88EU_AP_MODE=y
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FS_POSIX_ACL=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 735f8b7a5..ab2d22c0d 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -23,7 +23,7 @@ CONFIG_8139TOO_8129=y
 CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_88EU_AP_MODE is not set
+CONFIG_88EU_AP_MODE=y
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FS_POSIX_ACL=y
diff --git a/kernel.spec b/kernel.spec
index 5fc090038..f48c5f9b8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -635,18 +635,18 @@ Patch501: Fix-for-module-sig-verification.patch
 # rhbz 1431375
 Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch
 
-# rhbz 1526312 (accelerometer part of the bug), patches pending upstream
+# rhbz 1526312 patch merged into 5.0-rc#
 Patch504: iio-accel-kxcjk1013-Add-more-hardware-ids.patch
 
-# rhbz 1645070 patch queued upstream for merging into 4.21
+# rhbz 1645070 patch merged into 5.0-rc#
 Patch505: asus-fx503-keyb.patch
 
-# CVE-2019-3701 rhbz 1663729 1663730
-Patch506: CVE-2019-3701.patch
-
 # CVE-2019-3459 and CVE-2019-3460 rhbz 1663176 1663179 1665925
 Patch507: CVE-2019-3459-and-CVE-2019-3460.patch
 
+# rhbz 1663613 patch merged into 5.0-rc#
+Patch508: 0001-drm-nouveau-register-backlight-on-pascal-and-newer.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1921,6 +1921,13 @@ fi
 #
 #
 %changelog
+* Wed Jan 23 2019 Hans de Goede <hdegoede@redhat.com>
+- Add upstream patch fixing backlight control not working on some laptops
+  with a Nvidia GPU (rhbz#1663613, rhbz#1665505)
+
+* Wed Jan 23 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.4-200
+- Linux v4.20.4
+
 * Thu Jan 17 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.3-200
 - Linux v4.20.3 rebase