From: Patchwork <patchwork@emeril.freedesktop.org> To: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: intel-gfx@lists.freedesktop.org Subject: ✗ Fi.CI.BUILD: failure for series starting with [1/2] drm/i915: change to_mock() to an inline function Date: Fri, 08 Nov 2019 05:34:49 -0000 [thread overview] Message-ID: <157319128917.6462.618518718276074464@emeril.freedesktop.org> (raw) In-Reply-To: <20191108051356.29980-1-yamada.masahiro@socionext.com> == Series Details == Series: series starting with [1/2] drm/i915: change to_mock() to an inline function URL : https://patchwork.freedesktop.org/series/69169/ State : failure == Summary == Applying: drm/i915: change to_mock() to an inline function Applying: drm/i915: make more headers self-contained Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/selftests/mock_drm.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/selftests/mock_drm.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/mock_drm.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 drm/i915: make more headers self-contained 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@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Patchwork <patchwork@emeril.freedesktop.org> To: "Masahiro Yamada" <yamada.masahiro@socionext.com> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/2] drm/i915: change to_mock() to an inline function Date: Fri, 08 Nov 2019 05:34:49 -0000 [thread overview] Message-ID: <157319128917.6462.618518718276074464@emeril.freedesktop.org> (raw) Message-ID: <20191108053449.BhuqAsJx1kaMmInkNTB1VZcv269FyrWB3iYJ-BVx-jA@z> (raw) In-Reply-To: <20191108051356.29980-1-yamada.masahiro@socionext.com> == Series Details == Series: series starting with [1/2] drm/i915: change to_mock() to an inline function URL : https://patchwork.freedesktop.org/series/69169/ State : failure == Summary == Applying: drm/i915: change to_mock() to an inline function Applying: drm/i915: make more headers self-contained Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/selftests/mock_drm.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/selftests/mock_drm.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/mock_drm.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 drm/i915: make more headers self-contained 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@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-11-08 5:34 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-08 5:13 [PATCH 1/2] drm/i915: change to_mock() to an inline function Masahiro Yamada 2019-11-08 5:13 ` [Intel-gfx] " Masahiro Yamada 2019-11-08 5:13 ` Masahiro Yamada 2019-11-08 5:13 ` [PATCH 2/2] drm/i915: make more headers self-contained Masahiro Yamada 2019-11-08 5:13 ` [Intel-gfx] " Masahiro Yamada 2019-11-08 5:13 ` Masahiro Yamada 2019-11-08 5:42 ` Masahiro Yamada 2019-11-08 5:42 ` [Intel-gfx] " Masahiro Yamada 2019-11-08 5:42 ` Masahiro Yamada 2019-11-08 8:16 ` Chris Wilson 2019-11-08 8:16 ` [Intel-gfx] " Chris Wilson 2019-11-08 8:16 ` Chris Wilson 2019-11-08 5:34 ` Patchwork [this message] 2019-11-08 5:34 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/2] drm/i915: change to_mock() to an inline function Patchwork 2019-11-08 9:12 ` [PATCH 1/2] " Chris Wilson 2019-11-08 9:12 ` [Intel-gfx] " Chris Wilson 2019-11-08 9:12 ` Chris Wilson 2019-11-08 9:12 ` Chris Wilson
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=157319128917.6462.618518718276074464@emeril.freedesktop.org \ --to=patchwork@emeril.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=yamada.masahiro@socionext.com \ /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: linkBe 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.