summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-11-23 09:39:21 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2018-11-23 09:39:21 +0100
commitc6ac5beb034e6ef1f1377a021a856d79c4437536 (patch)
treeddf65c9120ef72ca0579d894519fcea62fd4bdfd
parentbb046fea530f5f444167854d94d66d2c9d4dcd6b (diff)
parentf8a875d85af41ed3c194f7f31429ab1b0ee85aa5 (diff)
downloadkernel-c6ac5beb034e6ef1f1377a021a856d79c4437536.tar.gz
kernel-c6ac5beb034e6ef1f1377a021a856d79c4437536.tar.xz
kernel-c6ac5beb034e6ef1f1377a021a856d79c4437536.zip
merge origin
-rw-r--r--CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch60
-rw-r--r--CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch55
-rw-r--r--arm64-rk3399-add-idle-states.patch89
-rw-r--r--cdrom-fix-improper-type-cast-which-can-leat-to-information-leak.patch35
-rw-r--r--configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP_HOST2
-rw-r--r--configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_PCIE2
-rw-r--r--kernel-aarch64-debug.config4
-rw-r--r--kernel-aarch64.config4
-rw-r--r--kernel-armv7hl-debug.config4
-rw-r--r--kernel-armv7hl-lpae-debug.config4
-rw-r--r--kernel-armv7hl-lpae.config4
-rw-r--r--kernel-armv7hl.config4
-rw-r--r--kernel.spec16
13 files changed, 111 insertions, 172 deletions
diff --git a/CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch b/CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch
deleted file mode 100644
index 2888fb6de..000000000
--- a/CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From patchwork Thu Sep 27 20:57:30 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [CI, 1/6] drm/i915/dp: Fix link retraining comment in
- intel_dp_long_pulse()
-From: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-X-Patchwork-Id: 253516
-Message-Id: <20180927205735.16651-1-dhinakaran.pandiyan@intel.com>
-To: intel-gfx@lists.freedesktop.org
-Date: Thu, 27 Sep 2018 13:57:30 -0700
-
-Comment claims link needs to be retrained because the connected sink raised
-a long pulse to indicate link loss. If the sink did so,
-intel_dp_hotplug() would have handled link retraining. Looking at the
-logs in Bugzilla referenced in commit '3cf71bc9904d ("drm/i915: Re-apply
-Perform link quality check, unconditionally during long pulse"")', the
-issue is that the sink does not trigger an interrupt. What we want is
-->detect() from user space to check link status and retrain. Ville's
-review for the original patch also indicates the same root cause. So,
-rewrite the comment.
-
-v2: Patch split and rewrote comment.
-
-Cc: Lyude Paul <lyude@redhat.com>
-Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Cc: Jani Nikula <jani.nikula@linux.intel.com>
-Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
-Cc: Jan-Marek Glogowski <glogow@fbihome.de>
-References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")
-Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
----
- drivers/gpu/drm/i915/intel_dp.c | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index 256a71c8c093..207b3ea2ed1a 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -5074,16 +5074,9 @@ intel_dp_long_pulse(struct intel_connector *connector,
- goto out;
- } else {
- /*
-- * If display is now connected check links status,
-- * there has been known issues of link loss triggering
-- * long pulse.
-- *
-- * Some sinks (eg. ASUS PB287Q) seem to perform some
-- * weird HPD ping pong during modesets. So we can apparently
-- * end up with HPD going low during a modeset, and then
-- * going back up soon after. And once that happens we must
-- * retrain the link to get a picture. That's in case no
-- * userspace component reacted to intermittent HPD dip.
-+ * Some external monitors do not signal loss of link
-+ * synchronization with an IRQ_HPD, so force a link status
-+ * check.
- */
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
-
diff --git a/CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch b/CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch
deleted file mode 100644
index bb9106d05..000000000
--- a/CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From patchwork Thu Sep 27 20:57:31 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [CI, 2/6] drm/i915/dp: Restrict link retrain workaround to external
- monitors
-From: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-X-Patchwork-Id: 253514
-Message-Id: <20180927205735.16651-2-dhinakaran.pandiyan@intel.com>
-To: intel-gfx@lists.freedesktop.org
-Date: Thu, 27 Sep 2018 13:57:31 -0700
-
-Commit '3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check,
-unconditionally during long pulse"")' applies a work around for sinks
-that don't signal link loss. The work around does not need to have to be
-that broad as the issue was seen with only one particular monitor; limit
-this only for external displays as eDP features like PSR turn off the link
-and the driver ends up retraining the link seeeing that link is not
-synchronized.
-
-Cc: Lyude Paul <lyude@redhat.com>
-Cc: Jan-Marek Glogowski <glogow@fbihome.de>
-Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
-References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")
-Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
----
- drivers/gpu/drm/i915/intel_dp.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index 207b3ea2ed1a..4e0870f3a4a5 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -5072,12 +5072,13 @@ intel_dp_long_pulse(struct intel_connector *connector,
- */
- status = connector_status_disconnected;
- goto out;
-- } else {
-- /*
-- * Some external monitors do not signal loss of link
-- * synchronization with an IRQ_HPD, so force a link status
-- * check.
-- */
-+ }
-+
-+ /*
-+ * Some external monitors do not signal loss of link synchronization
-+ * with an IRQ_HPD, so force a link status check.
-+ */
-+ if (!intel_dp_is_edp(intel_dp)) {
- struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
-
- intel_dp_retrain_link(encoder, ctx);
diff --git a/arm64-rk3399-add-idle-states.patch b/arm64-rk3399-add-idle-states.patch
new file mode 100644
index 000000000..903e3042c
--- /dev/null
+++ b/arm64-rk3399-add-idle-states.patch
@@ -0,0 +1,89 @@
+From f888da16628c150e23a80e9c24ed76d1cf8a94d2 Mon Sep 17 00:00:00 2001
+From: Tony Xie <tony.xie@rock-chips.com>
+Date: Fri, 24 Aug 2018 18:03:00 +0800
+Subject: arm64: dts: rockchip: Add idle-states to device tree for rk3399
+
+Add idle-states for cpu and cluster sleep states.
+
+Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+---
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+index c88e603396f6..b426902189c0 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+@@ -74,6 +74,7 @@
+ clocks = <&cru ARMCLKL>;
+ #cooling-cells = <2>; /* min followed by max */
+ dynamic-power-coefficient = <100>;
++ cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+ };
+
+ cpu_l1: cpu@1 {
+@@ -84,6 +85,7 @@
+ clocks = <&cru ARMCLKL>;
+ #cooling-cells = <2>; /* min followed by max */
+ dynamic-power-coefficient = <100>;
++ cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+ };
+
+ cpu_l2: cpu@2 {
+@@ -94,6 +96,7 @@
+ clocks = <&cru ARMCLKL>;
+ #cooling-cells = <2>; /* min followed by max */
+ dynamic-power-coefficient = <100>;
++ cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+ };
+
+ cpu_l3: cpu@3 {
+@@ -104,6 +107,7 @@
+ clocks = <&cru ARMCLKL>;
+ #cooling-cells = <2>; /* min followed by max */
+ dynamic-power-coefficient = <100>;
++ cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+ };
+
+ cpu_b0: cpu@100 {
+@@ -114,6 +118,7 @@
+ clocks = <&cru ARMCLKB>;
+ #cooling-cells = <2>; /* min followed by max */
+ dynamic-power-coefficient = <436>;
++ cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+ };
+
+ cpu_b1: cpu@101 {
+@@ -124,6 +129,29 @@
+ clocks = <&cru ARMCLKB>;
+ #cooling-cells = <2>; /* min followed by max */
+ dynamic-power-coefficient = <436>;
++ cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
++ };
++
++ idle-states {
++ entry-method = "psci";
++
++ CPU_SLEEP: cpu-sleep {
++ compatible = "arm,idle-state";
++ local-timer-stop;
++ arm,psci-suspend-param = <0x0010000>;
++ entry-latency-us = <120>;
++ exit-latency-us = <250>;
++ min-residency-us = <900>;
++ };
++
++ CLUSTER_SLEEP: cluster-sleep {
++ compatible = "arm,idle-state";
++ local-timer-stop;
++ arm,psci-suspend-param = <0x1010000>;
++ entry-latency-us = <400>;
++ exit-latency-us = <500>;
++ min-residency-us = <2000>;
++ };
+ };
+ };
+
+--
+cgit 1.2-0.3.lf.el7
diff --git a/cdrom-fix-improper-type-cast-which-can-leat-to-information-leak.patch b/cdrom-fix-improper-type-cast-which-can-leat-to-information-leak.patch
deleted file mode 100644
index ea594f4a6..000000000
--- a/cdrom-fix-improper-type-cast-which-can-leat-to-information-leak.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e4f3aa2e1e67bb48dfbaaf1cad59013d5a5bc276 Mon Sep 17 00:00:00 2001
-From: Young_X <YangX92@hotmail.com>
-Date: Wed, 3 Oct 2018 12:54:29 +0000
-Subject: cdrom: fix improper type cast, which can leat to information leak.
-
-From: Young_X <YangX92@hotmail.com>
-
-commit e4f3aa2e1e67bb48dfbaaf1cad59013d5a5bc276 upstream.
-
-There is another cast from unsigned long to int which causes
-a bounds check to fail with specially crafted input. The value is
-then used as an index in the slot array in cdrom_slot_status().
-
-This issue is similar to CVE-2018-16658 and CVE-2018-10940.
-
-Signed-off-by: Young_X <YangX92@hotmail.com>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/cdrom/cdrom.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/cdrom/cdrom.c
-+++ b/drivers/cdrom/cdrom.c
-@@ -2445,7 +2445,7 @@ static int cdrom_ioctl_select_disc(struc
- return -ENOSYS;
-
- if (arg != CDSL_CURRENT && arg != CDSL_NONE) {
-- if ((int)arg >= cdi->capacity)
-+ if (arg >= cdi->capacity)
- return -EINVAL;
- }
-
diff --git a/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP_HOST b/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP_HOST
index 416bd56df..d2deb65e4 100644
--- a/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP_HOST
+++ b/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP_HOST
@@ -1 +1 @@
-CONFIG_PCIE_ROCKCHIP_HOST=m
+# CONFIG_PCIE_ROCKCHIP_HOST is not set
diff --git a/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_PCIE b/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_PCIE
index 20fb6074b..8112067fc 100644
--- a/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_PCIE
+++ b/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_PCIE
@@ -1 +1 @@
-CONFIG_PHY_ROCKCHIP_PCIE=m
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 26cabeb61..8c1ca90ea 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4361,7 +4361,7 @@ CONFIG_PCIE_KIRIN=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_ROCKCHIP_HOST=m
+# CONFIG_PCIE_ROCKCHIP_HOST is not set
# CONFIG_PCIE_XILINX is not set
CONFIG_PCIE_XILINX_NWL=y
# CONFIG_PCI_FTPCI100 is not set
@@ -4438,7 +4438,7 @@ CONFIG_PHY_QCOM_USB_HS=m
CONFIG_PHY_ROCKCHIP_DP=m
CONFIG_PHY_ROCKCHIP_EMMC=m
CONFIG_PHY_ROCKCHIP_INNO_USB2=m
-CONFIG_PHY_ROCKCHIP_PCIE=m
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index a17be1f07..fc5fba7ca 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4339,7 +4339,7 @@ CONFIG_PCIE_KIRIN=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_ROCKCHIP_HOST=m
+# CONFIG_PCIE_ROCKCHIP_HOST is not set
# CONFIG_PCIE_XILINX is not set
CONFIG_PCIE_XILINX_NWL=y
# CONFIG_PCI_FTPCI100 is not set
@@ -4416,7 +4416,7 @@ CONFIG_PHY_QCOM_USB_HS=m
CONFIG_PHY_ROCKCHIP_DP=m
CONFIG_PHY_ROCKCHIP_EMMC=m
CONFIG_PHY_ROCKCHIP_INNO_USB2=m
-CONFIG_PHY_ROCKCHIP_PCIE=m
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 174683cad..34cd63252 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4614,7 +4614,7 @@ CONFIG_PCIE_ECRC=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_ROCKCHIP_HOST=m
+# CONFIG_PCIE_ROCKCHIP_HOST is not set
CONFIG_PCIE_XILINX=y
CONFIG_PCI_EXYNOS=y
# CONFIG_PCI_FTPCI100 is not set
@@ -4694,7 +4694,7 @@ CONFIG_PHY_QCOM_USB_HS=m
CONFIG_PHY_ROCKCHIP_DP=m
CONFIG_PHY_ROCKCHIP_EMMC=m
CONFIG_PHY_ROCKCHIP_INNO_USB2=m
-CONFIG_PHY_ROCKCHIP_PCIE=m
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
CONFIG_PHY_SAMSUNG_USB2=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 3ab37b794..ddbaf4348 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4394,7 +4394,7 @@ CONFIG_PCIE_ECRC=y
# CONFIG_PCI_ENDPOINT_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
-CONFIG_PCIE_ROCKCHIP_HOST=m
+# CONFIG_PCIE_ROCKCHIP_HOST is not set
# CONFIG_PCIE_XILINX is not set
CONFIG_PCI_EXYNOS=y
# CONFIG_PCI_FTPCI100 is not set
@@ -4468,7 +4468,7 @@ CONFIG_PHY_QCOM_UFS=m
CONFIG_PHY_ROCKCHIP_DP=m
CONFIG_PHY_ROCKCHIP_EMMC=m
CONFIG_PHY_ROCKCHIP_INNO_USB2=m
-CONFIG_PHY_ROCKCHIP_PCIE=m
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
CONFIG_PHY_SAMSUNG_USB2=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 2626951c1..c0c7b9d2d 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4372,7 +4372,7 @@ CONFIG_PCIE_ECRC=y
# CONFIG_PCI_ENDPOINT_TEST is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
-CONFIG_PCIE_ROCKCHIP_HOST=m
+# CONFIG_PCIE_ROCKCHIP_HOST is not set
# CONFIG_PCIE_XILINX is not set
CONFIG_PCI_EXYNOS=y
# CONFIG_PCI_FTPCI100 is not set
@@ -4446,7 +4446,7 @@ CONFIG_PHY_QCOM_UFS=m
CONFIG_PHY_ROCKCHIP_DP=m
CONFIG_PHY_ROCKCHIP_EMMC=m
CONFIG_PHY_ROCKCHIP_INNO_USB2=m
-CONFIG_PHY_ROCKCHIP_PCIE=m
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
CONFIG_PHY_SAMSUNG_USB2=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 1ceb5e688..769bddbdf 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4592,7 +4592,7 @@ CONFIG_PCIE_ECRC=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_ROCKCHIP_HOST=m
+# CONFIG_PCIE_ROCKCHIP_HOST is not set
CONFIG_PCIE_XILINX=y
CONFIG_PCI_EXYNOS=y
# CONFIG_PCI_FTPCI100 is not set
@@ -4672,7 +4672,7 @@ CONFIG_PHY_QCOM_USB_HS=m
CONFIG_PHY_ROCKCHIP_DP=m
CONFIG_PHY_ROCKCHIP_EMMC=m
CONFIG_PHY_ROCKCHIP_INNO_USB2=m
-CONFIG_PHY_ROCKCHIP_PCIE=m
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
CONFIG_PHY_SAMSUNG_USB2=m
diff --git a/kernel.spec b/kernel.spec
index ac11e39e4..908bc2192 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -601,8 +601,9 @@ Patch307: arm64-ZynqMP-firmware-clock-drivers-core.patch
Patch308: arm64-96boards-Rock960-CE-board-support.patch
Patch309: arm64-rockchip-add-initial-Rockpro64.patch
+Patch310: arm64-rk3399-add-idle-states.patch
-Patch310: gpio-pxa-handle-corner-case-of-unprobed-device.patch
+Patch311: gpio-pxa-handle-corner-case-of-unprobed-device.patch
Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
@@ -633,13 +634,6 @@ Patch501: Fix-for-module-sig-verification.patch
# rhbz 1431375
Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch
-# Fix known regression
-Patch504: CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch
-Patch505: CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch
-
-# CVE-2018-18710 rhbz 1645140 1648485
-Patch506: cdrom-fix-improper-type-cast-which-can-leat-to-information-leak.patch
-
# rhbz 1526312, patch is in 4.20, can be dropped on rebase
Patch507: 0001-HID-i2c-hid-override-HID-descriptors-for-certain-dev.patch
@@ -1916,6 +1910,12 @@ fi
#
#
%changelog
+* Thu Nov 22 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fixes for Rockchips 3399 devices
+
+* Wed Nov 21 2018 Jeremy Cline <jcline@redhat.com> - 4.19.3-300
+- Linux v4.19.3
+
* Tue Nov 20 2018 Hans de Goede <hdegoede@redhat.com>
- Turn on CONFIG_PINCTRL_GEMINILAKE on x86_64 (rhbz#1639155)
- Add a patch fixing touchscreens on HP AMD based laptops (rhbz#1644013)