kernel 5.15.14 release

8 files changed, 22 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a9de850be46..88a62d1abad3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-vfio-manjaro
-	pkgver = 5.15.12
+	pkgver = 5.15.14
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -18,15 +18,14 @@ pkgbase = linux-vfio-manjaro
 	makedepends = xz
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.12.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.14.xz
 	source = config
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch
-	source = 0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch
-	source = PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch
-	source = iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch
-	source = cpufreq_intel_pstate_ITMT_support_for_overclocked_system.patch
-	source = Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch
-	source = lg-laptop_Recognize_more_models.patch
+	source = 0002-PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch
+	source = 0003-iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch
+	source = 0004-cpufreq_intel_pstate_ITMT_support_for_overclocked_system.patch
+	source = 0005-Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch
+	source = 0006-lg-laptop_Recognize_more_models.patch
 	source = 0101-i2c-nuvoton-nc677x-hwmon-driver.patch
 	source = 0103-futex.patch
 	source = 0104-revert-xhci-Add-support-for-Renesas-controller-with-memory.patch
@@ -51,10 +50,9 @@ pkgbase = linux-vfio-manjaro
 	source = 0413-bootsplash.gitpatch
 	source = 0999-acs.gitpatch
 	sha256sums = 57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
-	sha256sums = 161deb7c6bd10e7c530a3ee83793e2e135f93a5afd73d8b16e251c708ade0b1b
+	sha256sums = 283bf58378a8f8ff457fc1259dd2864dc4de92295482ef3ae868e13e017250ee
 	sha256sums = 7c65b68bd250de8726c3dd5befa556cde515393c871dd0e0b599f40a5c33ac41
 	sha256sums = 986f8d802f37b72a54256f0ab84da83cb229388d58c0b6750f7c770818a18421
-	sha256sums = df5843818f1571841e1a8bdbe38d7f853d841f38de46d6a6a5765de089495578
 	sha256sums = e2823eff3355b7c88a3fa327ea2f84f23cbd36569e0a5f0f76599023f63a52ca
 	sha256sums = ce53090a4572cd6162d22225113082f7e4df5028a1230529d170460e26dcf849
 	sha256sums = ab0360eac59329eb84f028c2f402ee4a17e4b3dfacb7957355e6178d35af87b9
diff --git a/0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch b/0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch
deleted file mode 100644
index 49bbf222a828..000000000000
--- a/0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2dad55f373693e9e808fbdc836614162924990a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20H=C3=A4dicke?= <felixhaedicke@web.de>
-Date: Thu, 19 Nov 2020 09:22:32 +0100
-Subject: HID: quirks: Add Apple Magic Trackpad 2 to hid_have_special_driver
- list
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The Apple Magic Trackpad 2 is handled by the magicmouse driver. And
-there were severe stability issues when both drivers (hid-generic and
-hid-magicmouse) were loaded for this device.
-
-Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=210241
-
-Signed-off-by: Felix Hädicke <felixhaedicke@web.de>
----
- drivers/hid/hid-quirks.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
-index bf7ecab5d9e5..142e9dae2837 100644
---- a/drivers/hid/hid-quirks.c
-+++ b/drivers/hid/hid-quirks.c
-@@ -478,6 +478,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
- #if IS_ENABLED(CONFIG_HID_MAGICMOUSE)
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) },
-+	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD2) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD2) },
- #endif
- #if IS_ENABLED(CONFIG_HID_MAYFLASH)
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3) },
--- 
-cgit v1.2.3-1-gf6bb5
-
diff --git a/PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch b/0002-PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch
index 01b324a03a17..01b324a03a17 100644
--- a/PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch
+++ b/0002-PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch
diff --git a/iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch b/0003-iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch
index bc9dc1857912..bc9dc1857912 100644
--- a/iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch
+++ b/0003-iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch
diff --git a/cpufreq_intel_pstate_ITMT_support_for_overclocked_system.patch b/0004-cpufreq_intel_pstate_ITMT_support_for_overclocked_system.patch
index 1f7922e34722..1f7922e34722 100644
--- a/cpufreq_intel_pstate_ITMT_support_for_overclocked_system.patch
+++ b/0004-cpufreq_intel_pstate_ITMT_support_for_overclocked_system.patch
diff --git a/Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch b/0005-Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch
index 38cf2bde55bd..38cf2bde55bd 100644
--- a/Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch
+++ b/0005-Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch
diff --git a/lg-laptop_Recognize_more_models.patch b/0006-lg-laptop_Recognize_more_models.patch
index 8fbd217c36a2..8fbd217c36a2 100644
--- a/lg-laptop_Recognize_more_models.patch
+++ b/0006-lg-laptop_Recognize_more_models.patch
diff --git a/PKGBUILD b/PKGBUILD
index 7410e5138a28..40be042dc32e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,20 @@
 # Maintainer: Evgeny Myandin <evgeny.myandin[at]gmail[dot]com>
+# Manjaro credits:
+# Bernhard Landauer <bernhard@manjaro.org>
+# Philip Müller <philm[at]manjaro[dot]org>
+# Arch credits:
+# Tobias Powalowski <tpowa@archlinux.org>
+# Thomas Baechler <thomas@archlinux.org>
 #
 # This is original kernel of Manjaro Linux + ACS patch
 
+
 pkgbase=linux-vfio-manjaro
 pkgname=('linux-vfio-manjaro' 'linux-vfio-manjaro-headers')
 _kernelname=-VFIO-MANJARO
 _basekernel=5.15
 _basever=515
-pkgver=5.15.12
+pkgver=5.15.14
 pkgrel=1
 arch=('x86_64')
 url="https://www.kernel.org/"
@@ -30,12 +37,11 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
         'config'
         # ARCH Patches
         '0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch'
-        '0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch'
-        'PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch'
-        'iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch'
-        'cpufreq_intel_pstate_ITMT_support_for_overclocked_system.patch'
-        'Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch'
-        'lg-laptop_Recognize_more_models.patch'
+        '0002-PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch'
+        '0003-iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch'
+        '0004-cpufreq_intel_pstate_ITMT_support_for_overclocked_system.patch'
+        '0005-Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch'
+        '0006-lg-laptop_Recognize_more_models.patch'
         # MANJARO Patches
         '0101-i2c-nuvoton-nc677x-hwmon-driver.patch'
 #        '0102-iomap-iomap_bmap-should-accept-unwritten-maps.patch'
@@ -65,10 +71,9 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
         '0413-bootsplash.gitpatch'
         '0999-acs.gitpatch')
 sha256sums=('57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8'
-            '161deb7c6bd10e7c530a3ee83793e2e135f93a5afd73d8b16e251c708ade0b1b'
+            '283bf58378a8f8ff457fc1259dd2864dc4de92295482ef3ae868e13e017250ee'
             '7c65b68bd250de8726c3dd5befa556cde515393c871dd0e0b599f40a5c33ac41'
             '986f8d802f37b72a54256f0ab84da83cb229388d58c0b6750f7c770818a18421'
-            'df5843818f1571841e1a8bdbe38d7f853d841f38de46d6a6a5765de089495578'
             'e2823eff3355b7c88a3fa327ea2f84f23cbd36569e0a5f0f76599023f63a52ca'
             'ce53090a4572cd6162d22225113082f7e4df5028a1230529d170460e26dcf849'
             'ab0360eac59329eb84f028c2f402ee4a17e4b3dfacb7957355e6178d35af87b9'