From c1ef1a0f84ac9f0c25d9f4520cb693ffc0bd4270 Mon Sep 17 00:00:00 2001
From: Feng Shuo <steve.shuo.feng@gmail.com>
Date: Sun, 7 Jun 2026 17:20:09 +0800
Subject: [PATCH 1/2] workflow: update the support for 6.17 kernel

(cherry picked from commit f674a981e8965b823ed41dba1de93efff0966f3f)
---
 .github/workflows/create-redfs-pr.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/create-redfs-pr.yml b/.github/workflows/create-redfs-pr.yml
index 3974bba4b7b7d4..2f7a63d7e1a092 100644
--- a/.github/workflows/create-redfs-pr.yml
+++ b/.github/workflows/create-redfs-pr.yml
@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Checks-out to a different directory to avoid following checkout removing it.
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           path: linux
 
       - name: Try to checkout sync-${{ github.ref_name }} if it exists
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         id: try-checkout
         continue-on-error: true
         with:
@@ -29,7 +29,7 @@ jobs:
 
       - name: Fallback to checkout main
         if: steps.try-checkout.outcome == 'failure'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: DDNStorage/redfs
           ref: main
@@ -57,6 +57,7 @@ jobs:
           MAP["redfs-rhel9_6-570.12.1"]="5.14.0-570.12.1.el9_6"
           MAP["redfs-rhel10_0"]="6.12.0"
           MAP["redfs-ubuntu-noble-6.8.0-58.60"]="6.8.0-58.60.ubuntu"
+          MAP["redfs-ubuntu-hwe-6.17.0-16.16-24.04.1"]="6.17.0-16.16.ubuntu"
           kerver=${MAP["${{ github.ref_name }}"]}
           if [ -z ${kerver} ]; then
             echo "Cannot find target kernel version"

From 42f2df13e2bf11f3be737c4161beefe5a94eb3f1 Mon Sep 17 00:00:00 2001
From: Feng Shuo <steve.shuo.feng@gmail.com>
Date: Wed, 10 Jun 2026 09:29:23 +0800
Subject: [PATCH 2/2] workflow: add commit log into the new PR

(cherry picked from commit 9d59428915120ec0be8714ac5db79010c3917f58)
(cherry picked from commit 7e84600842d968445d819a2d14664784a90d3ce6)
---
 .github/workflows/create-redfs-pr.yml | 42 +++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/create-redfs-pr.yml b/.github/workflows/create-redfs-pr.yml
index 2f7a63d7e1a092..dfb382121c93ae 100644
--- a/.github/workflows/create-redfs-pr.yml
+++ b/.github/workflows/create-redfs-pr.yml
@@ -12,11 +12,42 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Checks-out to a different directory to avoid following checkout removing it.
-      - uses: actions/checkout@v6
+      - name: Checkout Linux source repo
+        uses: actions/checkout@v6
         with:
+          fetch-depth: 10
           path: linux
 
-      - name: Try to checkout sync-${{ github.ref_name }} if it exists
+      - name: Generate commit message
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_TITLE: ${{ github.event.pull_request.title }}
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          REPO_NAME: ${{ github.repository }}
+          BRANCH_NAME: ${{ github.ref_name }}
+        run: |
+          pushd linux
+          echo -e "Sync with $REPO_NAME branch $BRANCH_NAME\n" > ../commit.msg
+          echo -e "Sync with $REPO_NAME branch $BRANCH_NAME PR $PR_NUMBER" >> ../commit.msg
+          echo -e "$PR_TITLE\n" >> ../commit.msg
+          echo -e "(commit: ${{ github.sha }})\n" >> ../commit.msg
+          echo "Getting git log $BASE_SHA..$HEAD_SHA"
+          RET=0
+          git log --format="- %h %s" $BASE_SHA..$HEAD_SHA >> ../commit.msg || RET=$?
+          if [ $RET -ne 0 ]; then
+            echo "Failed to get git log with range, try to get log with single commit (too many commits?)."
+            git log --format="- %s" $HEAD_SHA >> ../commit.msg || RET=$?
+            if [ $RET -ne 0 ]; then
+              echo "Failed to get git log, exit with error."
+              exit 1
+            fi
+          fi
+          echo "Generated commit message:"
+          cat ../commit.msg
+          popd
+
+      - name: Try to checkout redfs branch sync-${{ github.ref_name }} if it exists
         uses: actions/checkout@v6
         id: try-checkout
         continue-on-error: true
@@ -27,7 +58,7 @@ jobs:
           path: redfs
           token: ${{ secrets.REDFS_TOKEN }}
 
-      - name: Fallback to checkout main
+      - name: Fallback to checkout redfs branch main
         if: steps.try-checkout.outcome == 'failure'
         uses: actions/checkout@v6
         with:
@@ -66,10 +97,9 @@ jobs:
           pushd redfs
           ./copy-from-linux-branch.sh $GITHUB_WORKSPACE/linux ${kerver}
           git add src/$kerver
-          echo -e "Sync with ${{ github.repository }} branch ${{ github.ref_name }}\n" > ../commit.msg
-          echo -e "Sync with ${{ github.repository }} branch ${{ github.ref_name }} by commit" >> ../commit.msg
-          echo -e "${{ github.sha }}" >> ../commit.msg
           RET=0
+          echo "Committing changes with message:"
+          cat ../commit.msg
           git commit -F ../commit.msg 2> ../commit.log || RET=$?;
           if [ -s ../commit.log ]; then
             echo "Error detcted in commit:"