Hi, Can some one please let me know on which branch does this script try to apply the patches so that I can fix the error? Currently I had sent my patchset rebased on top of drm-intel-next-queued. Thanks, Rajat On Wed, Mar 11, 2020 at 9:04 PM Patchwork <patchwork@xxxxxxxxxxxxxxxxxxxxxx> wrote: > > == Series Details == > > Series: drm/i915: Support for integrated privacy screens > URL : https://patchwork.freedesktop.org/series/74607/ > State : failure > > == Summary == > > Applying: intel_acpi: Rename drm_dev local variable to dev > Applying: drm/connector: Add support for privacy-screen property > Using index info to reconstruct a base tree... > M drivers/gpu/drm/drm_connector.c > M include/drm/drm_connector.h > Falling back to patching base and 3-way merge... > Auto-merging include/drm/drm_connector.h > CONFLICT (content): Merge conflict in include/drm/drm_connector.h > Auto-merging drivers/gpu/drm/drm_connector.c > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch' to see the failed patch > Patch failed at 0002 drm/connector: Add support for privacy-screen property > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
