summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaijian2024-12-09 22:47:09 +0100
committerTaijian2024-12-09 22:47:09 +0100
commitac28381479c2ec63db5aebe6e812af1d64c60ffb (patch)
treec84b6b9393bc6fa6e8d7eb70121ab5f3d81d4206
parent583f273ab4e2c99afbf0f2313c9e6b8c697545d7 (diff)
downloadaur-ac28381479c2ec63db5aebe6e812af1d64c60ffb.tar.gz
update to 6.12.4
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--0003-Bluetooth-btusb-Add-a-new-PID-VID-0489-e0f6-for-MT7922.patch15
-rw-r--r--PKGBUILD11
-rw-r--r--config3
4 files changed, 15 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4b184399dd60..cc04c490abf6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-g14
pkgdesc = Linux-g14
- pkgver = 6.12.3.arch1
+ pkgver = 6.12.4.arch1
pkgrel = 1
url = https://gitlab.com/dragonn/linux-g14.git
arch = x86_64
@@ -17,10 +17,10 @@ pkgbase = linux-g14
makedepends = xz
options = !strip
options = !debug
- source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.3.tar.xz
- source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.3.tar.sign
- source = https://github.com/archlinux/linux/releases/download/v6.12.3-arch1/linux-v6.12.3-arch1.patch.zst
- source = https://github.com/archlinux/linux/releases/download/v6.12.3-arch1/linux-v6.12.3-arch1.patch.zst.sig
+ source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.4.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.4.tar.sign
+ source = https://github.com/archlinux/linux/releases/download/v6.12.4-arch1/linux-v6.12.4-arch1.patch.zst
+ source = https://github.com/archlinux/linux/releases/download/v6.12.4-arch1/linux-v6.12.4-arch1.patch.zst.sig
source = config
source = partial-rog.config::https://gitlab.com/asus-linux/fedora-kernel/-/raw/rog-6.11/partial-rog.config
source = choose-gcc-optimization.sh
@@ -38,11 +38,11 @@ pkgbase = linux-g14
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF
- sha256sums = c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae
+ sha256sums = 6f35f821433d8421be7167990747c7c4a0c451958fb96883446301af13d71152
sha256sums = SKIP
- sha256sums = bfee79a682a98241842ddea4f86a57fedc8b23fd2a87366aa99add0d75b6bf16
+ sha256sums = 8d84f0e5f013c6c80cd2a2fe26da8e0c1170edc058f6f378e1261541781c12b9
sha256sums = SKIP
- sha256sums = 04f20ec52391bbd185d66ccb9bba7f50745ab2640e822124a385c58d01a2eaad
+ sha256sums = a6a234cd982d21f0d7daa3ba921293e450abd87ff5d7474d4a153b3f34cfabc5
sha256sums = a8afb5f75dde2eb038bdd2ec4cd2f8c600d6357ae64960c0df5f2c6c168514ce
sha256sums = 278118011d7a2eeca9971ac97b31bf0c55ab55e99c662ab9ae4717b55819c9a2
sha256sums = 48e12a587e3a93e73ca2bba9f3b418d70c0a56592581d2705384a07243c70d61
diff --git a/0003-Bluetooth-btusb-Add-a-new-PID-VID-0489-e0f6-for-MT7922.patch b/0003-Bluetooth-btusb-Add-a-new-PID-VID-0489-e0f6-for-MT7922.patch
deleted file mode 100644
index f2674880e2b4..000000000000
--- a/0003-Bluetooth-btusb-Add-a-new-PID-VID-0489-e0f6-for-MT7922.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 5c536151ef83..9b675fc9cc4f 100644
---- a/drivers/bluetooth/btusb.c
-+++ b/drivers/bluetooth/btusb.c
-@@ -565,6 +565,9 @@ static const struct usb_device_id blacklist_table[] = {
- BTUSB_VALID_LE_STATES },
-
- /* Additional MediaTek MT7921 Bluetooth devices */
-+ { USB_DEVICE(0x0489, 0xe0f6), .driver_info = BTUSB_MEDIATEK |
-+ BTUSB_WIDEBAND_SPEECH |
-+ BTUSB_VALID_LE_STATES },
- { USB_DEVICE(0x0489, 0xe0c8), .driver_info = BTUSB_MEDIATEK |
- BTUSB_WIDEBAND_SPEECH |
- BTUSB_VALID_LE_STATES },
-
diff --git a/PKGBUILD b/PKGBUILD
index b4fd23bccf00..88d0e70e750d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-g14
-pkgver=6.12.3.arch1
+pkgver=6.12.4.arch1
pkgrel=1
pkgdesc='Linux-g14'
url="https://gitlab.com/dragonn/linux-g14.git"
@@ -41,8 +41,7 @@ source=(
# 0000-asus-patch-series.patch::"https://gitlab.com/asus-linux/fedora-kernel/-/raw/rog-6.11/asus-patch-series.patch"
asus-patch-series.patch
0001-acpi-proc-idle-skip-dummy-wait.patch
- 0002-mt76_-mt7921_-Disable-powersave-features-by-default.patch
-# 0003-Bluetooth-btusb-Add-a-new-PID-VID-0489-e0f6-for-MT7922.patch
+ 0002-mt76_-mt7921_-Disable-powersave-features-by-default.patch
0004-ACPI-resource-Skip-IRQ-override-on-ASUS-TUF-Gaming-A.patch
0005-ACPI-resource-Skip-IRQ-override-on-ASUS-TUF-Gaming-A.patch
0006-mediatek-pci-reset.patch
@@ -57,11 +56,11 @@ validpgpkeys=(
83BC8889351B5DEBBB68416EB8AC08600F108CDF # Jan Alexander Steffens (heftig)
)
-sha256sums=('c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae'
+sha256sums=('6f35f821433d8421be7167990747c7c4a0c451958fb96883446301af13d71152'
'SKIP'
- 'bfee79a682a98241842ddea4f86a57fedc8b23fd2a87366aa99add0d75b6bf16'
+ '8d84f0e5f013c6c80cd2a2fe26da8e0c1170edc058f6f378e1261541781c12b9'
'SKIP'
- '04f20ec52391bbd185d66ccb9bba7f50745ab2640e822124a385c58d01a2eaad'
+ 'a6a234cd982d21f0d7daa3ba921293e450abd87ff5d7474d4a153b3f34cfabc5'
'a8afb5f75dde2eb038bdd2ec4cd2f8c600d6357ae64960c0df5f2c6c168514ce'
'278118011d7a2eeca9971ac97b31bf0c55ab55e99c662ab9ae4717b55819c9a2'
'48e12a587e3a93e73ca2bba9f3b418d70c0a56592581d2705384a07243c70d61'
diff --git a/config b/config
index 433e949750ae..456086c3762c 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.12.2-arch1 Kernel Configuration
+# Linux/x86 6.12.4-arch1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20240910"
CONFIG_CC_IS_GCC=y
@@ -7132,6 +7132,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y
CONFIG_FB_SYSMEM_FOPS=y
CONFIG_FB_DEFERRED_IO=y
CONFIG_FB_DMAMEM_HELPERS=y
+CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y
CONFIG_FB_IOMEM_FOPS=y
CONFIG_FB_IOMEM_HELPERS=y
CONFIG_FB_SYSMEM_HELPERS=y