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: "Dixit, Ashutosh" Date: Wed, 20 Apr 2022 05:59:31 -0000 Message-ID: <165043437152.24580.4399884329121076247@emeril.freedesktop.org> References: In-Reply-To: Subject: [igt-dev] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBzZXJp?= =?utf-8?q?es_starting_with_=5Bi-g-t=2C1/3=5D_lib/igt=5Fsysfs=3A_Add_helpe?= =?utf-8?q?rs_to_iterate_over_GTs_=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/3] lib/igt_sysfs: Add helpers to iterate over GTs (rev2) URL : https://patchwork.freedesktop.org/series/102664/ State : failure == Summary == Applying: lib/igt_sysfs: Add helpers to iterate over GTs Applying: tests/i915_pm_disag_freq: New test for media freq factor Applying: tests/i915_pm_disag_freq: New test for media freq factor Using index info to reconstruct a base tree... M tests/meson.build Falling back to patching base and 3-way merge... CONFLICT (add/add): Merge conflict in tests/i915/i915_pm_disag_freq.c Auto-merging tests/i915/i915_pm_disag_freq.c Patch failed at 0003 tests/i915_pm_disag_freq: New test for media freq factor 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".