summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2020-01-23 15:22:13 -0500
committergraysky2020-01-23 15:22:13 -0500
commit3f3f7daee1203c342486d2b20bc8004490ce3622 (patch)
tree80adf90565989fee45a26de17c47530f7fd14395
parentdcdb6273feb58f926260897c2dd8e67f308a273b (diff)
downloadaur-3f3f7daee1203c342486d2b20bc8004490ce3622.tar.gz
Update to 5.4.14-1
-rw-r--r--.SRCINFO44
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch4
-rw-r--r--0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch4
-rw-r--r--0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch4
-rw-r--r--0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch4
-rw-r--r--0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch4
-rw-r--r--0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch4
-rw-r--r--0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch4
-rw-r--r--0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch4
-rw-r--r--0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch4
-rw-r--r--0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch4
-rw-r--r--0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch4
-rw-r--r--0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch4
-rw-r--r--0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch4
-rw-r--r--0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch4
-rw-r--r--0015-ptp-free-ptp-device-pin-descriptors-properly.patch50
-rw-r--r--PKGBUILD34
17 files changed, 65 insertions, 119 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f81d794f64c..70acaf14f68 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-ck
- pkgver = 5.4.13
+ pkgver = 5.4.14
pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
@@ -8,8 +8,8 @@ pkgbase = linux-ck
makedepends = kmod
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.13.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.13.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.14.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.14.tar.sign
source = config
source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz
source = http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz
@@ -27,29 +27,27 @@ pkgbase = linux-ck
source = 0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
source = 0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
source = 0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
- source = 0015-ptp-free-ptp-device-pin-descriptors-properly.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = 49fb29d96d7e7c1d7e6082701bd26bfddd0fbc87a796fb6ba6258bc5fd386ad7
+ sha256sums = 531e18b0eef516fa4b3843f89729fafbf3c6bc00325b082cc1f2cfcb28c8d7f0
sha256sums = SKIP
sha256sums = 8470e238fcecbb03fdbadb35e6bfea5d09413f3f5ba38fa50ea600fd8f01abd1
sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5
sha256sums = f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c
- sha256sums = a8260a0cd688f145837510955df5bf1bad8e1a126fb2240a05cb33a524caff39
- sha256sums = 134df0458cfa0a1c9b5d68539fef58a5595b3c817cbf529f2216bdf5e9c513bf
- sha256sums = 0542389de25b787577c0042a17c0e667eeadadc5670abd8357dd60a5d5d99d36
- sha256sums = 59d4cff52a7c37429ab167d358d8bda44b1927361cd403be61bc5e8fc484d34b
- sha256sums = 6f88dfdbcd28e8bd216d1011605288651463e0de4c189c870785064c86d53bc9
- sha256sums = d03ffe961a87b513a882fc77d40ec04465691bdb74f8d29d175e8cf8e08dff9e
- sha256sums = b5f0c411c6537ffa77fee21bf5b89a603317361844149cd17d55e41522d62632
- sha256sums = ee5d63c50646143c869efd74c205126e26a312d28b21ea6d151b89a4083b79ed
- sha256sums = f031e429df53762f52e3fff252aea566f6a145d631cfd0486d5e7ce55987e999
- sha256sums = 0c91c462945bb6fc979ada9f81c957a299541ed0145ad948ab62827faf0235ec
- sha256sums = a1e0bd8cb85b948e2d9d4b47eb8652d45bc62fed2057c2d4119a23ac91fd87ef
- sha256sums = 80d3ced391fe7c7d185188a99935e48b78151be0c562bdb107b09eb20f4e8499
- sha256sums = fe3f7b524a1b03f53bcf2a67419682c3d843519176605603b45e99b70bd48ba0
- sha256sums = ef11e3682c1c6c89de0afb6da04d8191536ba79351051ec16061ed83eb69a10a
- sha256sums = 19c9357b886857ba90928fb720b555d648f6434fa434adaf8f522ec8465246ad
+ sha256sums = 6bc06821c6dc94a8af1018df31780dfbad354dce46792f65ee45bf6261968ec7
+ sha256sums = 4cdf7a686248aceeed6ca0296636dc0d4efaede2b77df98a6c3d559116156a00
+ sha256sums = c21b89ac3d24445dafcd8a3f2dfb6574eae0f50f3849f8abf1126862e2f82dcd
+ sha256sums = 2c7733955ede78f64b21d14b2f3ad0c8e0e98cc5eccb3228e532203d9c60056b
+ sha256sums = aa19094814bf528f760c7bc5f207fe51d1163c9255add0fad09f15d8747b4e8e
+ sha256sums = 8ec48bcab7e133fb3fcd49bac9e6aa8075beb2720ae07832a0c4962df9309b7c
+ sha256sums = 4d497f775c8785771cf28ed7a807d53617dfb914567def8b65a970c7472a8dc4
+ sha256sums = 022be9ea56431b07a169765def3f5b33330d710be527fde652a0164e1108d96f
+ sha256sums = 77f0cbc3fb6fd7e357c9c052b9d483e00a542eba3cf7f5baba2576f96ba71416
+ sha256sums = c7602e3ef7986da9b8a6197db281ee41381fae65ed2d1a814160638acd6978e9
+ sha256sums = 9fc6cfeab4da541b06993cc5a42d1d7de78238bcaf477d523cc51ae5337bd050
+ sha256sums = ba20b1928026473497a69e2a1c1c7c5fdd63c5f63818036998d9ee96258c34c1
+ sha256sums = a81cff6b669e36778a420b2c441a0ae79f257096d1059cc293bea931b91f6ff1
+ sha256sums = fa7b003f7c5acabae8cff051630a93e3d4556c275067516bb05922bfd9ee8b28
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler
@@ -58,11 +56,11 @@ pkgname = linux-ck
depends = initramfs
optdepends = crda: to set the correct wireless channels of your country
optdepends = linux-firmware: firmware images needed for some devices
- provides = linux-ck=5.4.13
+ provides = linux-ck=5.4.14
pkgname = linux-ck-headers
pkgdesc = Headers and scripts for building modules for Linux-ck kernel
depends = linux-ck
- provides = linux-ck-headers=5.4.13
- provides = linux-headers=5.4.13
+ provides = linux-ck-headers=5.4.14
+ provides = linux-headers=5.4.14
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index a0f85248be1..280298640a9 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From ace933a17f0b2e6e75e5ed330e8c12efae62aa53 Mon Sep 17 00:00:00 2001
+From 8bd7ec174daab92ac3305aca4d0ec09418254eff Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 01/16] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 01/15] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
diff --git a/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch b/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
index 3f0667d80b0..b3bb6a7f675 100644
--- a/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
+++ b/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
@@ -1,7 +1,7 @@
-From 78b64515af95e12dac806fa630ae4499e9527100 Mon Sep 17 00:00:00 2001
+From 6a7489b6d1f0a586c08cc3ae6887f53f59e96b86 Mon Sep 17 00:00:00 2001
From: Tuowen Zhao <ztuowen@gmail.com>
Date: Wed, 16 Oct 2019 15:06:28 -0600
-Subject: [PATCH 02/16] lib: devres: add a helper function for ioremap_uc
+Subject: [PATCH 02/15] lib: devres: add a helper function for ioremap_uc
Implement a resource managed strongly uncachable ioremap function.
diff --git a/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch b/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
index 75641b53510..160e043bdaa 100644
--- a/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
+++ b/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
@@ -1,7 +1,7 @@
-From dbc56c8785b2f6698722f3e9c189c7cb1f963679 Mon Sep 17 00:00:00 2001
+From 80b9003aa031b66333ab68692e0661b8d7a7e5f7 Mon Sep 17 00:00:00 2001
From: Tuowen Zhao <ztuowen@gmail.com>
Date: Wed, 16 Oct 2019 15:06:29 -0600
-Subject: [PATCH 03/16] mfd: intel-lpss: Use devm_ioremap_uc for MMIO
+Subject: [PATCH 03/15] mfd: intel-lpss: Use devm_ioremap_uc for MMIO
Some BIOS erroneously specifies write-combining BAR for intel-lpss-pci
in MTRR. This will cause the system to hang during boot. If possible,
diff --git a/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch b/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
index b95179c0f7b..e83e071bc53 100644
--- a/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
+++ b/0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
@@ -1,7 +1,7 @@
-From fa21078f336286d835bc734c8b4e4a24b67f245e Mon Sep 17 00:00:00 2001
+From 4c3a182e5ce8a05eb3db20b908a60015fb47d021 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Tue, 29 Oct 2019 20:00:22 +0300
-Subject: [PATCH 04/16] PCI: pciehp: Prevent deadlock on disconnect
+Subject: [PATCH 04/15] PCI: pciehp: Prevent deadlock on disconnect
This addresses deadlocks in these common cases in hierarchies containing
two switches:
diff --git a/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch b/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
index 9abef27eea2..26a8c985ee1 100644
--- a/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
+++ b/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
@@ -1,7 +1,7 @@
-From 7f6991978c1c388c2b11bb8101e4658f81fe85ed Mon Sep 17 00:00:00 2001
+From ab195ccffbd0721892d70102ab836fd106361fe7 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Thu, 28 Nov 2019 23:50:40 +0100
-Subject: [PATCH 05/16] ACPI: PM: s2idle: Rework ACPI events synchronization
+Subject: [PATCH 05/15] ACPI: PM: s2idle: Rework ACPI events synchronization
Note that the EC GPE processing need not be synchronized in
acpi_s2idle_wake() after invoking acpi_ec_dispatch_gpe(), because
diff --git a/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
index 2f69a8adb70..799133b03d3 100644
--- a/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+++ b/0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
@@ -1,7 +1,7 @@
-From 50b253fe7f01a82c8054d88319598db71ae5d083 Mon Sep 17 00:00:00 2001
+From e2842366b3a552a92584adf926eed813baeb6c68 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 24 Dec 2019 05:18:47 +0100
-Subject: [PATCH 06/16] iwlwifi: pcie: restore support for Killer Qu C0 NICs
+Subject: [PATCH 06/15] iwlwifi: pcie: restore support for Killer Qu C0 NICs
Commit 809805a820c6 refactored the cfg mangling. Unfortunately, in this
process the lines which picked the right cfg for Killer Qu C0 NICs after
diff --git a/0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch b/0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
index a128921803f..a94a9a4f9cf 100644
--- a/0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
+++ b/0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
@@ -1,7 +1,7 @@
-From e0a3ce4a9ebf049e76ea38c48e41f2c67f4b3330 Mon Sep 17 00:00:00 2001
+From 4e768b987ae3cde128a3e73b922a5bb8323b07e0 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Fri, 20 Sep 2019 11:39:18 +0300
-Subject: [PATCH 07/16] drm/i915: save AUD_FREQ_CNTRL state at audio domain
+Subject: [PATCH 07/15] drm/i915: save AUD_FREQ_CNTRL state at audio domain
suspend
When audio power domain is suspended, the display driver must
diff --git a/0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch b/0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
index aa403bc281c..ea89decb51e 100644
--- a/0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
+++ b/0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
@@ -1,7 +1,7 @@
-From e4bcd75c297598b87b89533c2c995f7d88c12010 Mon Sep 17 00:00:00 2001
+From ec0217ea2a6aeb9b99b84bbc7b01023ab1f3547a Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Thu, 3 Oct 2019 11:55:30 +0300
-Subject: [PATCH 08/16] drm/i915: Fix audio power up sequence for gen10+
+Subject: [PATCH 08/15] drm/i915: Fix audio power up sequence for gen10+
display
On platfroms with gen10+ display, driver must set the enable bit of
diff --git a/0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch b/0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
index 07dee0655f6..247c9251535 100644
--- a/0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
+++ b/0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
@@ -1,7 +1,7 @@
-From 7ff6d556c831f5f909b3315974816a45a3802670 Mon Sep 17 00:00:00 2001
+From cadc43b7d4de84c039658b482b52581b6d170081 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Thu, 3 Oct 2019 11:55:31 +0300
-Subject: [PATCH 09/16] drm/i915: extend audio CDCLK>=2*BCLK constraint to more
+Subject: [PATCH 09/15] drm/i915: extend audio CDCLK>=2*BCLK constraint to more
platforms
The CDCLK>=2*BCLK constraint applies to all generations since gen10.
diff --git a/0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch b/0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
index edd4404b9fe..2e6f4736b80 100644
--- a/0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
+++ b/0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
@@ -1,7 +1,7 @@
-From ce769a8e35537fc71cc9934a1fa39a481f994b25 Mon Sep 17 00:00:00 2001
+From 2828549af6c24235da03337c781053d4fc5edd08 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Tue, 31 Dec 2019 16:00:07 +0200
-Subject: [PATCH 10/16] drm/i915: Limit audio CDCLK>=2*BCLK constraint back to
+Subject: [PATCH 10/15] drm/i915: Limit audio CDCLK>=2*BCLK constraint back to
GLK only
Revert changes done in commit f6ec9483091f ("drm/i915: extend audio
diff --git a/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch b/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
index 13d562a6fa0..c65bc6b8ef2 100644
--- a/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+++ b/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
@@ -1,7 +1,7 @@
-From 93ca62c645759168768638e65d52452b4a9898a4 Mon Sep 17 00:00:00 2001
+From a8b102fd92427e5151d0c61f632fbe19dbe950b6 Mon Sep 17 00:00:00 2001
From: Boyan Ding <boyan.j.ding@gmail.com>
Date: Wed, 1 Jan 2020 11:44:49 -0800
-Subject: [PATCH 11/16] pinctrl: sunrisepoint: Add missing Interrupt Status
+Subject: [PATCH 11/15] pinctrl: sunrisepoint: Add missing Interrupt Status
register offset
Commit 179e5a6114cc ("pinctrl: intel: Remove default Interrupt Status
diff --git a/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch b/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
index 901b06d3871..70449614eb0 100644
--- a/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+++ b/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
@@ -1,7 +1,7 @@
-From 540f62738b8f3049e200a086cac75d14d289fae9 Mon Sep 17 00:00:00 2001
+From a5962f62a4174023fa53d6c74e64fa83032dca56 Mon Sep 17 00:00:00 2001
From: Mehmet Akif Tasova <makiftasova@gmail.com>
Date: Mon, 30 Dec 2019 15:48:16 +0200
-Subject: [PATCH 12/16] Revert "iwlwifi: mvm: fix scan config command size"
+Subject: [PATCH 12/15] Revert "iwlwifi: mvm: fix scan config command size"
Since v5.4-rc1 was released, iwlwifi started throwing errors when scan
commands were sent to the firmware with certain devices (depending on
diff --git a/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch b/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
index 221543b62b5..616c28ecd74 100644
--- a/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+++ b/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
@@ -1,7 +1,7 @@
-From cce47515454675d9c82448e865b42570f9eabc39 Mon Sep 17 00:00:00 2001
+From abfe541c371e84c6db50fd907c6a9941ee0a7da6 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Sat, 4 Jan 2020 23:29:22 -0800
-Subject: [PATCH 13/16] e1000e: Revert "e1000e: Make watchdog use delayed work"
+Subject: [PATCH 13/15] e1000e: Revert "e1000e: Make watchdog use delayed work"
This reverts commit 59653e6497d16f7ac1d9db088f3959f57ee8c3db.
diff --git a/0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch b/0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
index a12039123a6..6d4462df891 100644
--- a/0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
+++ b/0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
@@ -1,7 +1,7 @@
-From f247d4a6fe42acc60b775457e3c35b8289532590 Mon Sep 17 00:00:00 2001
+From ca12fbca4bf7482a73ace2a0504bd8fc7f980dc1 Mon Sep 17 00:00:00 2001
From: Leo Li <sunpeng.li@amd.com>
Date: Mon, 21 Oct 2019 14:58:47 -0400
-Subject: [PATCH 14/16] drm/amdgpu: Add DC feature mask to disable fractional
+Subject: [PATCH 14/15] drm/amdgpu: Add DC feature mask to disable fractional
pwm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
diff --git a/0015-ptp-free-ptp-device-pin-descriptors-properly.patch b/0015-ptp-free-ptp-device-pin-descriptors-properly.patch
deleted file mode 100644
index 6298fa44349..00000000000
--- a/0015-ptp-free-ptp-device-pin-descriptors-properly.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b89e9f6a3ec61a96b5abced31813ad043bda3827 Mon Sep 17 00:00:00 2001
-From: Vladis Dronov <vdronov@redhat.com>
-Date: Mon, 13 Jan 2020 14:00:09 +0100
-Subject: [PATCH 15/16] ptp: free ptp device pin descriptors properly
-
-There is a bug in ptp_clock_unregister(), where ptp_cleanup_pin_groups()
-first frees ptp->pin_{,dev_}attr, but then posix_clock_unregister() needs
-them to destroy a related sysfs device.
-
-These functions can not be just swapped, as posix_clock_unregister() frees
-ptp which is needed in the ptp_cleanup_pin_groups(). Fix this by calling
-ptp_cleanup_pin_groups() in ptp_clock_release(), right before ptp is freed.
-
-This makes this patch fix an UAF bug in a patch which fixes an UAF bug.
-
-Reported-by: Antti Laakso <antti.laakso@intel.com>
-Fixes: a33121e5487b ("ptp: fix the race between the release of ptp_clock and cdev")
-Link: https://lore.kernel.org/netdev/3d2bd09735dbdaf003585ca376b7c1e5b69a19bd.camel@intel.com/
-Signed-off-by: Vladis Dronov <vdronov@redhat.com>
-Acked-by: Richard Cochran <richardcochran@gmail.com>
----
- drivers/ptp/ptp_clock.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
-index 61fafe0374ce..b84f16bbd6f2 100644
---- a/drivers/ptp/ptp_clock.c
-+++ b/drivers/ptp/ptp_clock.c
-@@ -170,6 +170,7 @@ static void ptp_clock_release(struct device *dev)
- {
- struct ptp_clock *ptp = container_of(dev, struct ptp_clock, dev);
-
-+ ptp_cleanup_pin_groups(ptp);
- mutex_destroy(&ptp->tsevq_mux);
- mutex_destroy(&ptp->pincfg_mux);
- ida_simple_remove(&ptp_clocks_map, ptp->index);
-@@ -302,9 +303,8 @@ int ptp_clock_unregister(struct ptp_clock *ptp)
- if (ptp->pps_source)
- pps_unregister_source(ptp->pps_source);
-
-- ptp_cleanup_pin_groups(ptp);
--
- posix_clock_unregister(&ptp->clock);
-+
- return 0;
- }
- EXPORT_SYMBOL(ptp_clock_unregister);
---
-2.25.0
-
diff --git a/PKGBUILD b/PKGBUILD
index f6863f5f7d1..d78eae41467 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -61,7 +61,7 @@ _localmodcfg=
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-ck
-pkgver=5.4.13
+pkgver=5.4.14
pkgrel=1
_ckpatchversion=1
arch=(x86_64)
@@ -90,32 +90,30 @@ source=(
0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
-0015-ptp-free-ptp-device-pin-descriptors-properly.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('49fb29d96d7e7c1d7e6082701bd26bfddd0fbc87a796fb6ba6258bc5fd386ad7'
+sha256sums=('531e18b0eef516fa4b3843f89729fafbf3c6bc00325b082cc1f2cfcb28c8d7f0'
'SKIP'
'8470e238fcecbb03fdbadb35e6bfea5d09413f3f5ba38fa50ea600fd8f01abd1'
'8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
'f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c'
- 'a8260a0cd688f145837510955df5bf1bad8e1a126fb2240a05cb33a524caff39'
- '134df0458cfa0a1c9b5d68539fef58a5595b3c817cbf529f2216bdf5e9c513bf'
- '0542389de25b787577c0042a17c0e667eeadadc5670abd8357dd60a5d5d99d36'
- '59d4cff52a7c37429ab167d358d8bda44b1927361cd403be61bc5e8fc484d34b'
- '6f88dfdbcd28e8bd216d1011605288651463e0de4c189c870785064c86d53bc9'
- 'd03ffe961a87b513a882fc77d40ec04465691bdb74f8d29d175e8cf8e08dff9e'
- 'b5f0c411c6537ffa77fee21bf5b89a603317361844149cd17d55e41522d62632'
- 'ee5d63c50646143c869efd74c205126e26a312d28b21ea6d151b89a4083b79ed'
- 'f031e429df53762f52e3fff252aea566f6a145d631cfd0486d5e7ce55987e999'
- '0c91c462945bb6fc979ada9f81c957a299541ed0145ad948ab62827faf0235ec'
- 'a1e0bd8cb85b948e2d9d4b47eb8652d45bc62fed2057c2d4119a23ac91fd87ef'
- '80d3ced391fe7c7d185188a99935e48b78151be0c562bdb107b09eb20f4e8499'
- 'fe3f7b524a1b03f53bcf2a67419682c3d843519176605603b45e99b70bd48ba0'
- 'ef11e3682c1c6c89de0afb6da04d8191536ba79351051ec16061ed83eb69a10a'
- '19c9357b886857ba90928fb720b555d648f6434fa434adaf8f522ec8465246ad')
+ '6bc06821c6dc94a8af1018df31780dfbad354dce46792f65ee45bf6261968ec7'
+ '4cdf7a686248aceeed6ca0296636dc0d4efaede2b77df98a6c3d559116156a00'
+ 'c21b89ac3d24445dafcd8a3f2dfb6574eae0f50f3849f8abf1126862e2f82dcd'
+ '2c7733955ede78f64b21d14b2f3ad0c8e0e98cc5eccb3228e532203d9c60056b'
+ 'aa19094814bf528f760c7bc5f207fe51d1163c9255add0fad09f15d8747b4e8e'
+ '8ec48bcab7e133fb3fcd49bac9e6aa8075beb2720ae07832a0c4962df9309b7c'
+ '4d497f775c8785771cf28ed7a807d53617dfb914567def8b65a970c7472a8dc4'
+ '022be9ea56431b07a169765def3f5b33330d710be527fde652a0164e1108d96f'
+ '77f0cbc3fb6fd7e357c9c052b9d483e00a542eba3cf7f5baba2576f96ba71416'
+ 'c7602e3ef7986da9b8a6197db281ee41381fae65ed2d1a814160638acd6978e9'
+ '9fc6cfeab4da541b06993cc5a42d1d7de78238bcaf477d523cc51ae5337bd050'
+ 'ba20b1928026473497a69e2a1c1c7c5fdd63c5f63818036998d9ee96258c34c1'
+ 'a81cff6b669e36778a420b2c441a0ae79f257096d1059cc293bea931b91f6ff1'
+ 'fa7b003f7c5acabae8cff051630a93e3d4556c275067516bb05922bfd9ee8b28')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase