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: "Modem, Bhanuprakash" Date: Thu, 07 Dec 2023 04:43:12 -0000 Message-ID: <170192419244.28720.3116994063586462530@emeril.freedesktop.org> References: <20231127060500.2517204-1-bhanuprakash.modem@intel.com> In-Reply-To: <20231127060500.2517204-1-bhanuprakash.modem@intel.com> Subject: [igt-dev] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBzZXJp?= =?utf-8?q?es_starting_with_=5Bi-g-t=2C1/2=5D_tests/kms=5Fvrr=3A_New_subte?= =?utf-8?q?st_for_toggle_VRR_during_fastsets_=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: series starting with [i-g-t,1/2] tests/kms_vrr: New subtest for toggle VRR during fastsets (rev2) URL : https://patchwork.freedesktop.org/series/126906/ State : failure == Summary == Applying: tests/kms_vrr: New subtest for toggle VRR during fastsets Applying: HAX: Add VRR tests 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 0002 HAX: Add VRR tests 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".