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: "Ramalingam C" Date: Tue, 29 Mar 2022 12:41:12 -0000 Message-ID: <164855767214.5796.370092393765416646@emeril.freedesktop.org> References: <20220314051432.15785-1-ramalingam.c@intel.com> In-Reply-To: <20220314051432.15785-1-ramalingam.c@intel.com> Subject: [igt-dev] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciB0ZXN0?= =?utf-8?q?s/i915/gem=5Flmem=5Fswapping=3A_Add_ccs_subtests_=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: tests/i915/gem_lmem_swapping: Add ccs subtests (rev2) URL : https://patchwork.freedesktop.org/series/101324/ State : failure == Summary == Applying: tests/i915/gem_lmem_swapping: Add ccs subtests Using index info to reconstruct a base tree... M tests/i915/gem_lmem_swapping.c Falling back to patching base and 3-way merge... Auto-merging tests/i915/gem_lmem_swapping.c CONFLICT (content): Merge conflict in tests/i915/gem_lmem_swapping.c Patch failed at 0001 tests/i915/gem_lmem_swapping: Add ccs subtests 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".