From 56e24f4e518211ffd6b5f0711ea5d81cffab8d84 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Wed, 18 Feb 2026 17:03:11 -0800
Subject: [PATCH 1/2] Forked from containerd/containerd main: Add cherry-pick
 script

Updates:
+ Add cherry-pick for containerd/containerd#12921 (AF_UNIX on Windows)

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 README.md                  |  4 +++
 contrib/cherry-pick-prs.sh | 70 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100755 contrib/cherry-pick-prs.sh

diff --git a/README.md b/README.md
index 2c8192e7e05f7..59b29a432dc45 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+# FORK from containerd/containerd main
+
+Only make changes to contrib/cherry-pick-prs.sh
+
 ![containerd banner light mode](https://raw.githubusercontent.com/cncf/artwork/master/projects/containerd/horizontal/color/containerd-horizontal-color.png#gh-light-mode-only)
 ![containerd banner dark mode](https://raw.githubusercontent.com/cncf/artwork/master/projects/containerd/horizontal/white/containerd-horizontal-white.png#gh-dark-mode-only)
 
diff --git a/contrib/cherry-pick-prs.sh b/contrib/cherry-pick-prs.sh
new file mode 100755
index 0000000000000..d0a37a99e7a45
--- /dev/null
+++ b/contrib/cherry-pick-prs.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+# Cherry-pick GitHub PRs into current branch
+#
+# Usage: Edit the invocations below, then run this script
+
+set -e
+
+cherry_pick_pr() {
+    local repo=$1
+    local pr=$2
+    local pr_branch="pr-${repo//\//-}-$pr"
+
+    echo "=================================================="
+    echo "Cherry-picking $repo#$pr"
+    echo "=================================================="
+
+    # Fetch the PR
+    echo "Fetching PR #$pr from $repo..."
+    if ! git fetch "https://github.com/$repo" "pull/$pr/head:$pr_branch"; then
+        echo "Error: Failed to fetch PR #$pr from $repo"
+        return 1
+    fi
+
+    # Get merge base and commits
+    local merge_base=$(git merge-base HEAD "$pr_branch")
+    local commits=$(git rev-list --reverse "$merge_base..$pr_branch")
+    local count=$(echo "$commits" | wc -l)
+
+    echo "Found $count commit(s) to cherry-pick"
+    echo ""
+    git --no-pager log --oneline "$merge_base..$pr_branch"
+    echo ""
+
+    # Cherry-pick each commit
+    for commit in $commits; do
+        echo "Cherry-picking: $(git log -1 --oneline $commit)"
+        if ! git cherry-pick --empty=drop "$commit"; then
+            echo ""
+            echo "Error: Cherry-pick failed!"
+            echo "Resolve conflicts, then run:"
+            echo "  git cherry-pick --continue  # or --skip or --abort"
+            git branch -D "$pr_branch" 2>/dev/null || true
+            exit 1
+        fi
+    done
+
+    echo "✓ Successfully cherry-picked $repo#$pr"
+    echo ""
+
+    # Cleanup
+    git branch -D "$pr_branch" 2>/dev/null || true
+}
+
+echo "Current branch: $(git branch --show-current)"
+echo ""
+
+# ============================================================================
+# Edit this section to add/remove PRs to cherry-pick
+# ============================================================================
+
+# cherry_pick_pr <owner/repo> <pr_number>
+cherry_pick_pr containerd/containerd 12608
+cherry_pick_pr containerd/containerd 12562 # This also contains a commit from 12608, but that's fine since it will be skipped
+cherry_pick_pr containerd/containerd 12667
+cherry_pick_pr containerd/containerd 12785
+cherry_pick_pr containerd/containerd 12865
+cherry_pick_pr dmcgowan/containerd 11 # This needs a PR on containerd/containerd still
+cherry_pick_pr containerd/containerd 12921 # sys, dialer: support AF_UNIX sockets on Windows
+
+

From 7b812a19fa64aca07b72d704c9ef4a773dd0a74f Mon Sep 17 00:00:00 2001
From: David Scott <dave@recoil.org>
Date: Wed, 25 Feb 2026 14:35:37 +0000
Subject: [PATCH 2/2] Add cherry-pick for containerd/containerd#12938 (sparse
 mkfs on Windows)

Signed-off-by: David Scott <dave@recoil.org>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 contrib/cherry-pick-prs.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/contrib/cherry-pick-prs.sh b/contrib/cherry-pick-prs.sh
index d0a37a99e7a45..59c52277698d6 100755
--- a/contrib/cherry-pick-prs.sh
+++ b/contrib/cherry-pick-prs.sh
@@ -21,9 +21,9 @@ cherry_pick_pr() {
         return 1
     fi
 
-    # Get merge base and commits
+    # Get merge base and commits (skip merge commits)
     local merge_base=$(git merge-base HEAD "$pr_branch")
-    local commits=$(git rev-list --reverse "$merge_base..$pr_branch")
+    local commits=$(git rev-list --reverse --no-merges "$merge_base..$pr_branch")
     local count=$(echo "$commits" | wc -l)
 
     echo "Found $count commit(s) to cherry-pick"
@@ -59,6 +59,11 @@ echo ""
 # ============================================================================
 
 # cherry_pick_pr <owner/repo> <pr_number>
+#
+# The following PRs have been merged to upstream main and are included via rebase:
+#   #12821, #12836, #12849, #12868, #12913, #12916, #12923, #12928
+#
+# Only cherry-pick PRs that are still open:
 cherry_pick_pr containerd/containerd 12608
 cherry_pick_pr containerd/containerd 12562 # This also contains a commit from 12608, but that's fine since it will be skipped
 cherry_pick_pr containerd/containerd 12667
@@ -66,5 +71,6 @@ cherry_pick_pr containerd/containerd 12785
 cherry_pick_pr containerd/containerd 12865
 cherry_pick_pr dmcgowan/containerd 11 # This needs a PR on containerd/containerd still
 cherry_pick_pr containerd/containerd 12921 # sys, dialer: support AF_UNIX sockets on Windows
+cherry_pick_pr containerd/containerd 12938 # mount/manager: set sparse file attribute on Windows before mkfs