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: "Bhanuprakash Modem" Date: Wed, 29 Nov 2023 15:14:53 -0000 Message-ID: <170127089325.12093.16431130568711304316@emeril.freedesktop.org> References: <20231129134657.2826744-1-bhanuprakash.modem@intel.com> In-Reply-To: <20231129134657.2826744-1-bhanuprakash.modem@intel.com> Subject: [igt-dev] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciB0ZXN0?= =?utf-8?q?s/kms=5Fvrr=3A_Add_new_subtest_to_switch_RR_without_modeset?= 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/kms_vrr: Add new subtest to switch RR without modeset URL : https://patchwork.freedesktop.org/series/127047/ State : failure == Summary == Applying: tests/kms_vrr: Use lib helper to print connector modes Applying: tests/kms_vrr: Clear VRR before exit Applying: tests/kms_vrr: Move all config constaints to new function Applying: tests/kms_vrr: Fix bigjoiner constraint Applying: tests/kms_vrr: Add new subtest to switch RR without modeset Applying: HAX: Add seamless-rr-switch subtest to BAT Using index info to reconstruct a base tree... M tests/intel-ci/xe-fast-feedback.testlist Falling back to patching base and 3-way merge... Auto-merging tests/intel-ci/xe-fast-feedback.testlist CONFLICT (content): Merge conflict in tests/intel-ci/xe-fast-feedback.testlist Patch failed at 0006 HAX: Add seamless-rr-switch subtest to BAT 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".