Merge branch 'ophub:main' into main

Author: dy008

.github/workflows/compile-allwinner-h6-kernel.yml

@@ -105,7 +105,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Initialization environment
         id: init

.github/workflows/compile-beta-kernel.yml

@@ -102,7 +102,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Initialization environment
         id: init

.github/workflows/compile-mainline-stable-kernel.yml

@@ -108,7 +108,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Initialization environment
         id: init

.github/workflows/compile-rockchip-rk3588-kernel.yml

@@ -100,7 +100,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Initialization environment
         id: init

.github/workflows/compile-rockchip-rk35xx-kernel.yml

@@ -99,7 +99,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Initialization environment
         id: init

.github/workflows/delete-older-releases-workflows.yml

@@ -53,7 +53,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Initialization environment
         id: init

kernel-config/release/general/config-6.12

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.61 Kernel Configuration
+# Linux/arm64 6.12.62 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 14.3.Rel1 (Build arm-14.174)) 14.3.1 20250623"
 CONFIG_CC_IS_GCC=y

kernel-config/release/rk3588/config-6.1

@@ -1120,7 +1120,7 @@ CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK=y
 CONFIG_NF_LOG_SYSLOG=m
 CONFIG_NETFILTER_CONNCOUNT=m
 CONFIG_NF_CONNTRACK_MARK=y
@@ -1150,7 +1150,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
+CONFIG_NF_NAT=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1358,7 +1358,7 @@ CONFIG_IP_VS_PE_SIP=m
 #
 # IP: Netfilter Configuration
 #
-CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_DEFRAG_IPV4=y
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
@@ -1432,7 +1432,7 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
 # end of IPv6: Netfilter Configuration
 
-CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
@@ -5991,53 +5991,50 @@ CONFIG_MALI_FENCE_DEBUG=y
 # CONFIG_MALI_GPU_MMU_AARCH64 is not set
 CONFIG_MALI_PWRSOFT_765=y
 # CONFIG_MALI_KUTF is not set
-CONFIG_MALI_BIFROST=y
-CONFIG_MALI_PLATFORM_NAME="rk"
-CONFIG_MALI_REAL_HW=y
-# CONFIG_MALI_BIFROST_NO_MALI is not set
-# CONFIG_MALI_IS_FPGA is not set
+# CONFIG_MALI_BIFROST is not set
+# CONFIG_MALI_CSF_INCLUDE_FW is not set
+CONFIG_MALI_VALHALL=y
+CONFIG_MALI_VALHALL_PLATFORM_NAME="rk"
+CONFIG_MALI_VALHALL_REAL_HW=y
+# CONFIG_MALI_VALHALL_NO_MALI is not set
 
 #
 # Platform specific options
 #
 # end of Platform specific options
 
-CONFIG_MALI_CSF_SUPPORT=y
-CONFIG_MALI_BIFROST_DEVFREQ=y
-CONFIG_MALI_BIFROST_GATOR_SUPPORT=y
-CONFIG_MALI_BIFROST_ENABLE_TRACE=y
-# CONFIG_MALI_ARBITER_SUPPORT is not set
-# CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND is not set
-# CONFIG_MALI_DMA_BUF_LEGACY_COMPAT is not set
-# CONFIG_MALI_CORESIGHT is not set
-CONFIG_MALI_BIFROST_EXPERT=y
-CONFIG_LARGE_PAGE_SUPPORT=y
-CONFIG_PAGE_MIGRATION_SUPPORT=y
+CONFIG_MALI_VALHALL_CSF_SUPPORT=y
+CONFIG_MALI_VALHALL_DEVFREQ=y
+CONFIG_MALI_VALHALL_GATOR_SUPPORT=y
+CONFIG_MALI_VALHALL_ENABLE_TRACE=y
+# CONFIG_MALI_VALHALL_DMA_BUF_MAP_ON_DEMAND is not set
+# CONFIG_MALI_VALHALL_DMA_BUF_LEGACY_COMPAT is not set
+# CONFIG_MALI_VALHALL_CORESIGHT is not set
+CONFIG_MALI_VALHALL_EXPERT=y
+CONFIG_VALHALL_LARGE_PAGE_SUPPORT=y
+# CONFIG_MALI_VALHALL_CORESTACK is not set
 
 #
 # Debug options
 #
-CONFIG_MALI_BIFROST_DEBUG=y
-CONFIG_MALI_BIFROST_FENCE_DEBUG=y
-CONFIG_MALI_BIFROST_SYSTEM_TRACE=y
+CONFIG_MALI_VALHALL_DEBUG=y
+CONFIG_MALI_VALHALL_FENCE_DEBUG=y
+CONFIG_MALI_VALHALL_SYSTEM_TRACE=y
 
 #
 # Instrumentation options
 #
-CONFIG_MALI_PRFCNT_SET_PRIMARY=y
-# CONFIG_MALI_BIFROST_PRFCNT_SET_SECONDARY is not set
-# CONFIG_MALI_PRFCNT_SET_TERTIARY is not set
-# CONFIG_MALI_JOB_DUMP is not set
+CONFIG_MALI_VALHALL_PRFCNT_SET_PRIMARY=y
+# CONFIG_MALI_VALHALL_PRFCNT_SET_SECONDARY is not set
+# CONFIG_MALI_VALHALL_PRFCNT_SET_TERTIARY is not set
+# CONFIG_MALI_VALHALL_JOB_DUMP is not set
 
 #
 # Workarounds
 #
-# CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED is not set
-# CONFIG_MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE is not set
-# CONFIG_MALI_ARBITRATION is not set
-CONFIG_MALI_TRACE_POWER_GPU_WORK_PERIOD=y
-CONFIG_MALI_CSF_INCLUDE_FW=y
-# CONFIG_MALI_VALHALL is not set
+# CONFIG_MALI_VALHALL_HW_ERRATA_1485982_NOT_AFFECTED is not set
+# CONFIG_MALI_VALHALL_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE is not set
+CONFIG_MALI_VALHALL_TRACE_POWER_GPU_WORK_PERIOD=y
 
 #
 # Frame buffer Devices

kernel-config/release/rk35xx/config-6.1

@@ -1120,7 +1120,7 @@ CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK=y
 CONFIG_NF_LOG_SYSLOG=m
 CONFIG_NETFILTER_CONNCOUNT=m
 CONFIG_NF_CONNTRACK_MARK=y
@@ -1150,7 +1150,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
+CONFIG_NF_NAT=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1358,7 +1358,7 @@ CONFIG_IP_VS_PE_SIP=m
 #
 # IP: Netfilter Configuration
 #
-CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_DEFRAG_IPV4=y
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
@@ -1432,7 +1432,7 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
 # end of IPv6: Netfilter Configuration
 
-CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m