From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: MIME-Version: 1.0 From: Patchwork Date: Mon, 12 Apr 2021 10:59:40 -0000 Message-ID: <161822518004.8700.15648147005989528169@emeril.freedesktop.org> References: <20210412103147.61299-1-zbigniew.kempczynski@intel.com> In-Reply-To: <20210412103147.61299-1-zbigniew.kempczynski@intel.com> Subject: [igt-dev] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBJbnRy?= =?utf-8?q?oduce_IGT_allocator_=28rev34=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: =?utf-8?q?Zbigniew_Kempczy=C5=84ski?= Cc: igt-dev@lists.freedesktop.org List-ID: == Series Details == Series: Introduce IGT allocator (rev34) URL : https://patchwork.freedesktop.org/series/82954/ State : failure == Summary == Applying: lib/igt_list: Add igt_list_del_init() Applying: lib/igt_list: Add igt_list_for_each_entry_safe_reverse Applying: lib/igt_map: Adopt Mesa hash table Using index info to reconstruct a base tree... A lib/Makefile.sources M lib/meson.build Falling back to patching base and 3-way merge... Auto-merging lib/meson.build CONFLICT (modify/delete): lib/Makefile.sources deleted in HEAD and modified in lib/igt_map: Adopt Mesa hash table. Version lib/igt_map: Adopt Mesa hash table of lib/Makefile.sources left in tree. Patch failed at 0003 lib/igt_map: Adopt Mesa hash table 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