From: Jani Nikula <jani.nikula@linux.intel.com>
To: Patchwork <patchwork@emeril.freedesktop.org>,
Krzysztof Kozlowski <krzk@kernel.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: ✗ Fi.CI.BUILD: failure for drm/i915: Fix Kconfig indentation
Date: Tue, 08 Oct 2019 09:52:40 +0300 [thread overview]
Message-ID: <87pnj7d8zr.fsf@intel.com> (raw)
In-Reply-To: <20191007192756.14083.71406@emeril.freedesktop.org>
On Mon, 07 Oct 2019, Patchwork <patchwork@emeril.freedesktop.org> wrote:
> == Series Details ==
>
> Series: drm/i915: Fix Kconfig indentation
> URL : https://patchwork.freedesktop.org/series/67707/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915: Fix Kconfig indentation
> Using index info to reconstruct a base tree...
> M drivers/gpu/drm/i915/Kconfig.debug
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/Kconfig.debug
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig.debug
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Patch failed at 0001 drm/i915: Fix Kconfig indentation
> 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".
This conflict is due to a CI-only commit in drm-tip that's not headed
for upstream. Eyeballed the patch, git show -w indicates no changes, so
applied to drm-intel-next-queued. Thanks for the patch.
BR,
Jani.
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2019-10-08 6:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-07 17:33 [PATCH v3] drm/i915: Fix Kconfig indentation Krzysztof Kozlowski
2019-10-07 17:33 ` Krzysztof Kozlowski
2019-10-07 19:27 ` ✗ Fi.CI.BUILD: failure for " Patchwork
2019-10-08 6:52 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87pnj7d8zr.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=krzk@kernel.org \
--cc=patchwork@emeril.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.