Эх сурвалжийг харах

clean(ntsync): remove commented-out lockdep patches (already in base kernel)

Patches 0001-0003 are all already applied in android13-5.10
sublevel 210 and later. Removing dead commented blocks.
TheWildJames 1 сар өмнө
parent
commit
e1c2a641c1

+ 1 - 13
.github/actions/ntsync/action.yml

@@ -26,18 +26,6 @@ runs:
           rm -f drivers/misc/ntsync.c
         fi
 
-        if [[ ( ${{ inputs.version }} == "android12-5.10" && "${{ inputs.sublevel }}" -le "208" ) || ( ${{ inputs.version }} = "android13-5.10" && "${{ inputs.sublevel }}" -le "210" ) ]]; then
-          patch -p1 -N < ${{ github.action_path }}/patches/0001-lockdep-mark-local_lock_t.patch
-        fi
-
-        if [[ ( ${{ inputs.version }} == "android12-5.10" && "${{ inputs.sublevel }}" -le "208" ) || ( ${{ inputs.version }} = "android13-5.10" && "${{ inputs.sublevel }}" -le "210" ) ]]; then
-          patch -p1 -N < ${{ github.action_path }}/patches/0002-lockdep-fix-init-map-confusion.patch
-        fi
-
-        if [[ ( ${{ inputs.version }} == "android12-5.10" && "${{ inputs.sublevel }}" -le "208" ) || ( ${{ inputs.version }} = "android13-5.10" && "${{ inputs.sublevel }}" -le "210" ) ]]; then
-          patch -p1 -N < ${{ github.action_path }}/patches/0003-lockdep-assert-none-held.patch
-        fi
-        
         if [[ ${{ inputs.version }} = "android13-5.10" ]]; then
           patch -p1 < ${{ github.workspace }}/kernel_patches/common/ntsync/ntsync_compat_android12-5.10.patch
         elif [[ ${{ inputs.version }} = "android14-5.15" ]]; then
@@ -53,4 +41,4 @@ runs:
       with:
         config_list: |
           CONFIG_NTSYNC=y
-   
+