Rebasing (1/8)
Auto-merging docs/design/fused_moe_modular_kernel.md
CONFLICT (content): Merge conflict in docs/design/fused_moe_modular_kernel.md
Auto-merging tests/kernels/moe/modular_kernel_tools/cli_args.py
Auto-merging tests/kernels/moe/modular_kernel_tools/common.py
Auto-merging tests/kernels/moe/modular_kernel_tools/mk_objects.py
Auto-merging tests/kernels/moe/modular_kernel_tools/profile_modular_kernel.py
Auto-merging tests/kernels/moe/test_block_fp8.py
Auto-merging tests/kernels/moe/test_cutlass_moe.py
Auto-merging tests/kernels/moe/test_flashinfer.py
CONFLICT (content): Merge conflict in tests/kernels/moe/test_flashinfer.py
Auto-merging tests/kernels/moe/test_modular_kernel_combinations.py
CONFLICT (content): Merge conflict in tests/kernels/moe/test_modular_kernel_combinations.py
Auto-merging tests/kernels/moe/test_moe.py
Auto-merging vllm/envs.py
Auto-merging vllm/lora/layers/fused_moe.py
Auto-merging vllm/model_executor/layers/fused_moe/batched_deep_gemm_moe.py
Auto-merging vllm/model_executor/layers/fused_moe/cutlass_moe.py
Auto-merging vllm/model_executor/layers/fused_moe/deep_gemm_moe.py
Auto-merging vllm/model_executor/layers/fused_moe/fallback.py
Auto-merging vllm/model_executor/layers/fused_moe/flashinfer_cutedsl_moe.py
Auto-merging vllm/model_executor/layers/fused_moe/flashinfer_cutlass_moe.py
Auto-merging vllm/model_executor/layers/fused_moe/fused_batched_moe.py
Auto-merging vllm/model_executor/layers/fused_moe/fused_marlin_moe.py
Auto-merging vllm/model_executor/layers/fused_moe/fused_moe.py
CONFLICT (content): Merge conflict in vllm/model_executor/layers/fused_moe/fused_moe.py
Auto-merging vllm/model_executor/layers/fused_moe/gpt_oss_triton_kernels_moe.py
Auto-merging vllm/model_executor/layers/fused_moe/modular_kernel.py
CONFLICT (content): Merge conflict in vllm/model_executor/layers/fused_moe/modular_kernel.py
Auto-merging vllm/model_executor/layers/fused_moe/rocm_aiter_fused_moe.py
Auto-merging vllm/model_executor/layers/fused_moe/trtllm_moe.py
Auto-merging vllm/model_executor/layers/fused_moe/xpu_fused_moe.py
Auto-merging vllm/model_executor/warmup/deep_gemm_warmup.py
error: could not apply b64a0a74d... [Feature]: Remove Chunking From FusedMoE
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b64a0a74d... [Feature]: Remove Chunking From FusedMoE