From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <igt-dev-bounces@lists.freedesktop.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Jeevan B" <jeevan.b@intel.com>
Date: Tue, 28 Nov 2023 14:24:51 -0000
Message-ID: <170118149167.8221.10564450255673853306@emeril.freedesktop.org>
References: <20231128113707.2463245-1-jeevan.b@intel.com>
In-Reply-To: <20231128113707.2463245-1-jeevan.b@intel.com>
Subject: [igt-dev] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBBZGQg?=
 =?utf-8?q?FBC_support_to_PSR/PSR2_tests_=28rev6=29?=
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/igt-dev>,
 <mailto:igt-dev-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/igt-dev>
List-Post: <mailto:igt-dev@lists.freedesktop.org>
List-Help: <mailto:igt-dev-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/igt-dev>,
 <mailto:igt-dev-request@lists.freedesktop.org?subject=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" <igt-dev-bounces@lists.freedesktop.org>
List-ID: <igt-dev@lists.freedesktop.org>

== Series Details ==

Series: Add FBC support to PSR/PSR2 tests (rev6)
URL   : https://patchwork.freedesktop.org/series/126689/
State : failure

== Summary ==

Applying: tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests
Using index info to reconstruct a base tree...
M	tests/intel/kms_psr.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/kms_psr.c
CONFLICT (content): Merge conflict in tests/intel/kms_psr.c
Patch failed at 0001 tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests
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".