bump to 6.1.21

3 files changed, 12 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c227d96a2b1e..265920a07411 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-aarch64-flippy
-	pkgver = 6.1.18
+	pkgver = 6.1.21
 	pkgrel = 1
 	url = https://github.com/unifreq/linux-6.1.y
 	arch = aarch64
@@ -9,11 +9,11 @@ pkgbase = linux-aarch64-flippy
 	makedepends = dtc
 	makedepends = uboot-tools
 	options = !strip
-	source = linux-6.1.y-43a6f6232f8d460d7cb6b5c7d562c94b03300d4f.tar.gz::https://github.com/unifreq/linux-6.1.y/archive/43a6f6232f8d460d7cb6b5c7d562c94b03300d4f.tar.gz
+	source = linux-6.1.y-f9790f631bd69bb7d4d2b21b4547cc224a86f7b7.tar.gz::https://github.com/unifreq/linux-6.1.y/archive/f9790f631bd69bb7d4d2b21b4547cc224a86f7b7.tar.gz
 	source = config
 	source = linux.preset
-	sha256sums = db7f8bbe3b048a10abd125ece0c4a539e7222030dca1a3c7d6d1ba5e6d9c4da5
-	sha256sums = b64ee3c7ce2a159e19c2b786b40a9031e79a54e330684107c06e89e4e7456077
+	sha256sums = 1dcaf8d500920bf8f3cdde1f5259a85a7fdaec5363689b87e1b43ef968895c58
+	sha256sums = a4c4f35cb6eae42e06985850f294d1278d9332154715dd2df5ff885a25fc05b3
 	sha256sums = bdcd6cbf19284b60fac6d6772f1e0ec2e2fe03ce7fe3d7d16844dd6d2b5711f3
 
 pkgname = linux-aarch64-flippy
@@ -36,12 +36,12 @@ pkgname = linux-aarch64-flippy-headers
 
 pkgname = linux-aarch64-flippy-dtb-allwinner
 	pkgdesc = DTB files for Allwinner SoCs for flippy's AArch64 kernel
-	provides = linux-aarch64-flippy-dtb=6.1.18
+	provides = linux-aarch64-flippy-dtb=6.1.21
 
 pkgname = linux-aarch64-flippy-dtb-amlogic
 	pkgdesc = DTB files for Amlogic SoCs for flippy's AArch64 kernel
-	provides = linux-aarch64-flippy-dtb=6.1.18
+	provides = linux-aarch64-flippy-dtb=6.1.21
 
 pkgname = linux-aarch64-flippy-dtb-rockchip
 	pkgdesc = DTB files for Rockchip SoCs for flippy's AArch64 kernel
-	provides = linux-aarch64-flippy-dtb=6.1.18
+	provides = linux-aarch64-flippy-dtb=6.1.21
diff --git a/PKGBUILD b/PKGBUILD
index 3fb352bb7018..2d9145d9fc37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: 7Ji <pugokughin@gmail.com>
 
 _desc="flippy's AArch64-focused fork aiming to increase usability"
-_pkgver_main=6.1.18
+_pkgver_main=6.1.21
 _pkgver_suffix=flippy
 _pkgver_uname="${_pkgver_main}-${_pkgver_suffix}"
 _flippy_repo='linux-6.1.y'
-_flippy_commit='43a6f6232f8d460d7cb6b5c7d562c94b03300d4f'
+_flippy_commit='f9790f631bd69bb7d4d2b21b4547cc224a86f7b7'
 _srcname="${_flippy_repo}-${_flippy_commit}"
 
 pkgbase=linux-aarch64-flippy
@@ -31,8 +31,8 @@ source=(
   'linux.preset'
 )
 sha256sums=(
-  'db7f8bbe3b048a10abd125ece0c4a539e7222030dca1a3c7d6d1ba5e6d9c4da5'
-  'b64ee3c7ce2a159e19c2b786b40a9031e79a54e330684107c06e89e4e7456077'
+  '1dcaf8d500920bf8f3cdde1f5259a85a7fdaec5363689b87e1b43ef968895c58'
+  'a4c4f35cb6eae42e06985850f294d1278d9332154715dd2df5ff885a25fc05b3'
   'bdcd6cbf19284b60fac6d6772f1e0ec2e2fe03ce7fe3d7d16844dd6d2b5711f3'
 )
 
diff --git a/config b/config
index 75e56874d11d..025fb12f3979 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.18 Kernel Configuration
+# Linux/arm64 6.1.21 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
 CONFIG_CC_IS_GCC=y
@@ -2865,9 +2865,6 @@ CONFIG_R8125_MULTIPLE_RX_QUEUE=y
 CONFIG_R8125_MULTIPLE_TX_QUEUE=y
 CONFIG_R8125_USE_FIRMWARE_FILE=y
 CONFIG_R8125_PM_SUPPORT=y
-CONFIG_R8125_DOUBLE_VLAN=y
-CONFIG_R8125_PAGE_REUSE=y
-CONFIG_R8125_RX_PACKET_FRAGMENT=y
 CONFIG_R8168=m
 # CONFIG_NET_VENDOR_RENESAS is not set
 # CONFIG_NET_VENDOR_ROCKER is not set