From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Patchwork To: priyanka.dandamudi@intel.com Date: Tue, 26 Apr 2022 07:31:44 -0000 Message-ID: <165095830419.12386.15938185164146379086@emeril.freedesktop.org> References: <20220426072049.518210-1-priyanka.dandamudi@intel.com> In-Reply-To: <20220426072049.518210-1-priyanka.dandamudi@intel.com> Subject: [igt-dev] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBIQVgg?= =?utf-8?q?add_description_to_prime=5Fself=5Fimport_=28rev2=29?= List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: igt-dev@lists.freedesktop.org Cc: igt-dev@lists.freedesktop.org Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: == Series Details == Series: HAX add description to prime_self_import (rev2) URL : https://patchwork.freedesktop.org/series/101586/ State : failure == Summary == Applying: prime_self_import: Add description for test Applying: HAX: don't do full run Using index info to reconstruct a base tree... M tests/intel-ci/fast-feedback.testlist Falling back to patching base and 3-way merge... Auto-merging tests/intel-ci/fast-feedback.testlist CONFLICT (content): Merge conflict in tests/intel-ci/fast-feedback.testlist Patch failed at 0002 HAX: don't do full run 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".