From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: MIME-Version: 1.0 From: Patchwork Date: Fri, 27 Mar 2020 12:07:40 -0000 Message-ID: <158531086004.17237.12929166077507543366@emeril.freedesktop.org> References: <20200326135322.9958-1-mika.kahola@intel.com> In-Reply-To: <20200326135322.9958-1-mika.kahola@intel.com> Subject: [igt-dev] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciB0ZXN0?= =?utf-8?q?s/kms=5Fconcurrent=3A_Test_maximum_number_of_planes_supported_b?= =?utf-8?q?y_the_platform_=28rev4=29?= List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: igt-dev@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: "Kahola, Mika" Cc: igt-dev@lists.freedesktop.org List-ID: == Series Details == Series: tests/kms_concurrent: Test maximum number of planes supported by the platform (rev4) URL : https://patchwork.freedesktop.org/series/75104/ State : failure == Summary == Applying: tests/kms_concurrent: Test maximum number of planes supported by the platform Using index info to reconstruct a base tree... M tests/kms_concurrent.c Falling back to patching base and 3-way merge... Auto-merging tests/kms_concurrent.c CONFLICT (content): Merge conflict in tests/kms_concurrent.c Patch failed at 0001 tests/kms_concurrent: Test maximum number of planes supported by the platform 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". _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev