[Misc] Reorganize inputs - #35182
Merged
Merged
Mergify / Rule: auto-rebase if approved, ready, and 40 commits behind main (rebase)
failed
Mar 25, 2026 in 0s
Base branch update has failed
Git reported the following error:
Rebasing (1/19)
CONFLICT (modify/delete): tests/entrypoints/openai/test_serving_responses.py deleted in HEAD and modified in d3946bf5a ([Refactor] Reorganize inputs). Version d3946bf5a ([Refactor] Reorganize inputs) of tests/entrypoints/openai/test_serving_responses.py left in tree.
Auto-merging tests/models/multimodal/processing/test_common.py
CONFLICT (content): Merge conflict in tests/models/multimodal/processing/test_common.py
Auto-merging tests/plugins/prithvi_io_processor_plugin/prithvi_io_processor/prithvi_processor.py
Auto-merging vllm/beam_search.py
CONFLICT (content): Merge conflict in vllm/beam_search.py
Auto-merging vllm/benchmarks/datasets.py
CONFLICT (content): Merge conflict in vllm/benchmarks/datasets.py
Auto-merging vllm/engine/protocol.py
Auto-merging vllm/entrypoints/chat_utils.py
Auto-merging vllm/entrypoints/llm.py
Auto-merging vllm/entrypoints/openai/chat_completion/serving.py
CONFLICT (content): Merge conflict in vllm/entrypoints/openai/chat_completion/serving.py
Auto-merging vllm/entrypoints/openai/completion/serving.py
Auto-merging vllm/entrypoints/openai/engine/serving.py
CONFLICT (content): Merge conflict in vllm/entrypoints/openai/engine/serving.py
Auto-merging vllm/entrypoints/openai/realtime/serving.py
Auto-merging vllm/entrypoints/openai/responses/serving.py
CONFLICT (content): Merge conflict in vllm/entrypoints/openai/responses/serving.py
Auto-merging vllm/entrypoints/openai/speech_to_text/speech_to_text.py
CONFLICT (content): Merge conflict in vllm/entrypoints/openai/speech_to_text/speech_to_text.py
Auto-merging vllm/entrypoints/pooling/embed/serving.py
CONFLICT (content): Merge conflict in vllm/entrypoints/pooling/embed/serving.py
Auto-merging vllm/entrypoints/pooling/pooling/serving.py
CONFLICT (content): Merge conflict in vllm/entrypoints/pooling/pooling/serving.py
Auto-merging vllm/entrypoints/pooling/score/serving.py
Auto-merging vllm/entrypoints/serve/tokenize/serving.py
CONFLICT (modify/delete): vllm/inputs/data.py deleted in d3946bf5a ([Refactor] Reorganize inputs) and modified in HEAD. Version HEAD of vllm/inputs/data.py left in tree.
Auto-merging vllm/inputs/preprocess.py
CONFLICT (content): Merge conflict in vllm/inputs/preprocess.py
Auto-merging vllm/model_executor/models/audioflamingo3.py
Auto-merging vllm/model_executor/models/clip.py
Auto-merging vllm/model_executor/models/colmodernvbert.py
Auto-merging vllm/model_executor/models/deepseek_ocr.py
Auto-merging vllm/model_executor/models/deepseek_ocr2.py
Auto-merging vllm/model_executor/models/deepseek_vl2.py
Auto-merging vllm/model_executor/models/ernie45_vl.py
Auto-merging vllm/model_executor/models/funasr.py
Auto-merging vllm/model_executor/models/funaudiochat.py
Auto-merging vllm/model_executor/models/gemma3_mm.py
Auto-merging vllm/model_executor/models/gemma3n_mm.py
Auto-merging vllm/model_executor/models/glm4_1v.py
Auto-merging vllm/model_executor/models/glm4v.py
Auto-merging vllm/model_executor/models/granite_speech.py
Auto-merging vllm/model_executor/models/hunyuan_vision.py
Auto-merging vllm/model_executor/models/hyperclovax_vision.py
Auto-merging vllm/model_executor/models/interfaces.py
Auto-merging vllm/model_executor/models/interns1.py
Auto-merging vllm/model_executor/models/internvl.py
CONFLICT (content): Merge conflict in vllm/model_executor/models/internvl.py
Auto-merging vllm/model_executor/models/isaac.py
Auto-merging vllm/model_executor/models/keye.py
Auto-merging vllm/model_executor/models/kimi_k25.py
Auto-merging vllm/model_executor/models/kimi_vl.py
Auto-merging vllm/model_executor/models/lfm2_vl.py
Auto-merging vllm/model_executor/models/llava.py
Auto-merging vllm/model_executor/models/minicpmv.py
Auto-merging vllm/model_executor/models/mistral3.py
Auto-merging vllm/model_executor/models/mllama4.py
CONFLICT (content): Merge conflict in vllm/model_executor/models/mllama4.py
Auto-merging vllm/model_executor/models/molmo.py
Auto-merging vllm/model_executor/models/molmo2.py
Auto-merging vllm/model_executor/models/nano_nemotron_vl.py
CONFLICT (content): Merge conflict in vllm/model_executor/models/nano_nemotron_vl.py
Auto-merging vllm/model_executor/models/nemotron_parse.py
Auto-merging vllm/model_executor/models/nvlm_d.py
CONFLICT (content): Merge conflict in vllm/model_executor/models/nvlm_d.py
Auto-merging vllm/model_executor/models/ovis2_5.py
Auto-merging vllm/model_executor/models/paddleocr_vl.py
Auto-merging vllm/model_executor/models/phi3v.py
Auto-merging vllm/model_executor/models/pixtral.py
Auto-merging vllm/model_executor/models/qwen2_5_omni_thinker.py
Auto-merging vllm/model_executor/models/qwen2_audio.py
Auto-merging vllm/model_executor/models/qwen2_vl.py
Auto-merging vllm/model_executor/models/qwen3_asr.py
Auto-merging vllm/model_executor/models/qwen3_asr_realtime.py
Auto-merging vllm/model_executor/models/qwen3_omni_moe_thinker.py
Auto-merging vllm/model_executor/models/qwen3_vl.py
CONFLICT (content): Merge conflict in vllm/model_executor/models/qwen3_vl.py
Auto-merging vllm/model_executor/models/qwen_vl.py
Auto-merging vllm/model_executor/models/siglip.py
Auto-merging vllm/model_executor/models/skyworkr1v.py
CONFLICT (content): Merge conflict in vllm/model_executor/models/skyworkr1v.py
Auto-merging vllm/model_executor/models/step3_vl.py
Auto-merging vllm/model_executor/models/terratorch.py
Auto-merging vllm/model_executor/models/transformers/multimodal.py
Auto-merging vllm/model_executor/models/ultravox.py
Auto-merging vllm/model_executor/models/voxtral.py
Auto-merging vllm/model_executor/models/voxtral_realtime.py
Auto-merging vllm/model_executor/models/whisper.py
Auto-merging vllm/multimodal/parse.py
Auto-merging vllm/multimodal/processing/context.py
Auto-merging vllm/multimodal/processing/processor.py
Auto-merging vllm/multimodal/utils.py
Auto-merging vllm/platforms/interface.py
Auto-merging vllm/plugins/io_processors/interface.py
Auto-merging vllm/renderers/base.py
CONFLICT (content): Merge conflict in vllm/renderers/base.py
Auto-merging vllm/renderers/hf.py
CONFLICT (content): Merge conflict in vllm/renderers/hf.py
Auto-merging vllm/renderers/inputs/preprocess.py
Auto-merging vllm/v1/engine/async_llm.py
CONFLICT (content): Merge conflict in vllm/v1/engine/async_llm.py
Auto-merging vllm/v1/engine/input_processor.py
CONFLICT (content): Merge conflict in vllm/v1/engine/input_processor.py
Auto-merging vllm/v1/engine/llm_engine.py
error: could not apply d3946bf5a... [Refactor] Reorganize inputs
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 d3946bf5a... [Refactor] Reorganize inputs
Loading