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 Date: Wed, 22 Mar 2023 13:18:26 -0000 Message-ID: <167949110625.13421.6323404927701922869@emeril.freedesktop.org> References: <20230322123301.1791267-1-mauro.chehab@linux.intel.com> In-Reply-To: <20230322123301.1791267-1-mauro.chehab@linux.intel.com> Subject: [igt-dev] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciB4ZS94?= =?utf-8?q?e=5Fmodule=5Fload=3A_add_a_test_to_load/unload_Xe_driver?= List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: igt-dev@lists.freedesktop.org Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: Mauro Carvalho Chehab Cc: igt-dev@lists.freedesktop.org List-ID: == Series Details == Series: xe/xe_module_load: add a test to load/unload Xe driver URL : https://patchwork.freedesktop.org/series/115511/ State : failure == Summary == Applying: intel-ci: update blacklists to work with the Xe driver Applying: lib/igt_kmod: add support for Xe driver Applying: xe/xe_module_load: add a test to load/unload Xe driver Using index info to reconstruct a base tree... M tests/meson.build Falling back to patching base and 3-way merge... Auto-merging tests/meson.build CONFLICT (content): Merge conflict in tests/meson.build Patch failed at 0003 xe/xe_module_load: add a test to load/unload Xe driver 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".