pkd/debian: Use 'git am -3' to fix some conflicts

.github/workflows/debian.yml

@@ -49,7 +49,7 @@ jobs:
 
         # apply surface build/packaging patches
         for PATCH in ../*.patch; do
-          git am ${PATCH}
+          git am -3 ${PATCH}
         done
 
         git add .
@@ -57,7 +57,7 @@ jobs:
 
         # apply surface patches
         for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
-          git am < ${PATCH}
+          git am -3 ${PATCH}
         done
 
         git add .

.github/workflows/debian_lts.yml

@@ -49,7 +49,7 @@ jobs:
 
         # apply surface build/packaging patches
         for PATCH in ../*.patch; do
-          git am ${PATCH}
+          git am -3 ${PATCH}
         done
 
         git add .
@@ -57,7 +57,7 @@ jobs:
 
         # apply surface patches
         for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
-          git am ${PATCH}
+          git am -3 ${PATCH}
         done
 
         git add .