Merge branch 'main' into flux-ipadapter-docs

Author: sayakpaul

src/diffusers/pipelines/flux/pipeline_flux_controlnet_inpainting.py

@@ -930,8 +930,8 @@ def __call__(
         if isinstance(self.controlnet, FluxControlNetModel):
             control_image = self.prepare_image(
                 image=control_image,
-                width=height,
-                height=width,
+                width=width,
+                height=height,
                 batch_size=batch_size * num_images_per_prompt,
                 num_images_per_prompt=num_images_per_prompt,
                 device=device,