[Misc] Main2Main: align vLLM main to 3b95523e (Nov 12)

.github/vllm-main-verified.commit

@@ -1 +1 @@
-24420b7a341af37a9bc3186e6fc6062512e0aa58
+3b95523ed904cf02a26b872f4a900ef17e6be8ad

.github/workflows/_build_csrc_cache.yaml

@@ -152,7 +152,10 @@ jobs:
           fi
           git fetch "$BASE_REMOTE" "$BASE_REF"
           git cat-file -e "${BASE_SHA}^{commit}"
-          git rebase "$BASE_SHA"
+          # Preserve resolved merges when this exact base is already included.
+          if ! git merge-base --is-ancestor "$BASE_SHA" HEAD; then
+            git rebase "$BASE_SHA"
+          fi
 
       - name: Update submodules
         run: |

.github/workflows/_ensure_csrc_cache.yaml

@@ -139,7 +139,10 @@ jobs:
           fi
           git fetch "$BASE_REMOTE" "$BASE_REF"
           git cat-file -e "${BASE_SHA}^{commit}"
-          git rebase "$BASE_SHA"
+          # Preserve resolved merges when this exact base is already included.
+          if ! git merge-base --is-ancestor "$BASE_SHA" HEAD; then
+            git rebase "$BASE_SHA"
+          fi
 
       - name: Calculate csrc hash
         id: hash

.github/workflows/_selected_tests.yaml

@@ -161,7 +161,10 @@ jobs:
             BASE_SHA=$(git rev-parse FETCH_HEAD)
           fi
           git cat-file -e "${BASE_SHA}^{commit}"
-          git rebase "$BASE_SHA"
+          # Preserve resolved merges when this exact base is already included.
+          if ! git merge-base --is-ancestor "$BASE_SHA" HEAD; then
+            git rebase "$BASE_SHA"
+          fi
           git submodule sync --recursive
           git submodule update --init --recursive
 

.github/workflows/_selected_tests_upstream.yaml

@@ -146,7 +146,10 @@ jobs:
                 BASE_SHA=$(git rev-parse FETCH_HEAD)
               fi
               git cat-file -e "${BASE_SHA}^{commit}"
-              git rebase "$BASE_SHA"
+              # Preserve resolved merges when this exact base is already included.
+              if ! git merge-base --is-ancestor "$BASE_SHA" HEAD; then
+                git rebase "$BASE_SHA"
+              fi
               git submodule sync --recursive
               git submodule update --init --recursive
 

.github/workflows/pr_test.yaml

@@ -531,7 +531,10 @@ jobs:
             exit 1
           fi
 
-          git rebase "$BASE_SHA"
+          # Preserve resolved merges when this exact base is already included.
+          if ! git merge-base --is-ancestor "$BASE_SHA" HEAD; then
+            git rebase "$BASE_SHA"
+          fi
           echo "base_sha=$BASE_SHA" >> "$GITHUB_OUTPUT"
 
       - name: Validate test coverage config

.github/workflows/scripts/estimated_times.yaml

@@ -9,6 +9,9 @@
 # do not trigger the full CI suite.
 
 estimated_times:
+  # Initial scheduling estimate including seven cases and Triton compilation;
+  # replace with observed hardware duration after the first successful run.
+  tests/e2e/pull_request/one_card/test_categorical_sample_bias.py: 120
   tests/e2e/pull_request/one_card/test_mc2_local_padding.py: 60
   tests/e2e/pull_request/one_card/test_mla_prolog_head_padding.py: 30
   tests/e2e/pull_request/one_card/model_runner_v2/test_uva_prefix.py: 30