From 8cd5622082d425b801a49398c130113eca9669f2 Mon Sep 17 00:00:00 2001
From: Ihor Solodrai <ihor.solodrai@linux.dev>
Date: Wed, 15 Apr 2026 10:39:49 -0700
Subject: [PATCH] Add linux-next sync workflow for bpf CI

Add a scheduled GitHub Actions workflow that refreshes the linux-next
branch in kernel-patches/bpf from upstream linux-next.

The workflow keeps a lightweight blobless clone of kernel-patches/bpf,
fetches bpf_base and upstream linux-next, and recreates linux-next
as a synthetic merge of upstream linux-next into bpf_base. When run in
kernel-patches/bpf, it force-pushes the updated branch on success.

On merge conflicts, the workflow fails without mutating the remote
linux-next branch.

Assisted-by: Codex:gpt-5.4
Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
---
 .github/workflows/linux-next-sync.yml | 90 +++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 .github/workflows/linux-next-sync.yml

diff --git a/.github/workflows/linux-next-sync.yml b/.github/workflows/linux-next-sync.yml
new file mode 100644
index 00000000..cb28d12a
--- /dev/null
+++ b/.github/workflows/linux-next-sync.yml
@@ -0,0 +1,90 @@
+name: linux-next sync
+
+on:
+  push:
+    branches:
+      - linux-next-sync
+  schedule:
+    - cron: '17 */6 * * *'
+  workflow_dispatch:
+
+concurrency:
+  group: linux-next-sync
+  cancel-in-progress: false
+
+permissions:
+  contents: write
+
+jobs:
+  sync-linux-next:
+    runs-on: ubuntu-slim
+    steps:
+      - name: Clone kernel-patches/bpf (blobless)
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          git clone \
+            --filter=blob:none \
+            --no-checkout \
+            --single-branch \
+            https://github.com/kernel-patches/bpf.git \
+            repo
+
+      - name: Configure git identity
+        working-directory: repo
+        shell: bash
+        run: |
+          git config user.name 'bpf-ci[bot]'
+          git config user.email 'bot+bpf-ci@kernel.org'
+
+      - name: Sync linux-next branch
+        working-directory: repo
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          BASE_BRANCH='bpf_base'
+          HEAD_BRANCH='linux-next'
+          UPSTREAM_REMOTE='linux-next-upstream'
+          UPSTREAM_URL='https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git'
+          UPSTREAM_BRANCH='master'
+
+          git remote add "${UPSTREAM_REMOTE}" "${UPSTREAM_URL}"
+          git config "remote.${UPSTREAM_REMOTE}.promisor" true
+          git config "remote.${UPSTREAM_REMOTE}.partialclonefilter" blob:none
+
+          git fetch --no-tags origin \
+            "+refs/heads/${BASE_BRANCH}:refs/remotes/origin/${BASE_BRANCH}"
+          git fetch --no-tags --filter=blob:none "${UPSTREAM_REMOTE}" \
+            "+refs/heads/${UPSTREAM_BRANCH}:refs/remotes/${UPSTREAM_REMOTE}/${UPSTREAM_BRANCH}"
+
+          if git ls-remote --exit-code --heads origin "${HEAD_BRANCH}" >/dev/null 2>&1; then
+            git fetch --no-tags origin \
+              "+refs/heads/${HEAD_BRANCH}:refs/remotes/origin/${HEAD_BRANCH}"
+          fi
+
+          git checkout -B "${HEAD_BRANCH}" "refs/remotes/origin/${BASE_BRANCH}"
+          git merge --no-ff --no-edit "refs/remotes/${UPSTREAM_REMOTE}/${UPSTREAM_BRANCH}"
+
+      - name: Push linux-next branch
+        if: ${{ github.repository == 'kernel-patches/bpf' }}
+        working-directory: repo
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          HEAD_BRANCH='linux-next'
+          git remote set-url origin \
+            "https://x-access-token:${GITHUB_TOKEN}@github.com/kernel-patches/bpf.git"
+
+          if git show-ref --verify --quiet "refs/remotes/origin/${HEAD_BRANCH}"; then
+            old_head=$(git rev-parse "refs/remotes/origin/${HEAD_BRANCH}")
+            git push \
+              --force-with-lease="refs/heads/${HEAD_BRANCH}:${old_head}" \
+              origin HEAD:"refs/heads/${HEAD_BRANCH}"
+          else
+            git push origin HEAD:"refs/heads/${HEAD_BRANCH}"
+          fi