From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 392DBC433DB for ; Thu, 14 Jan 2021 11:15:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D35B6238EC for ; Thu, 14 Jan 2021 11:15:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D35B6238EC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F2C8891C1; Thu, 14 Jan 2021 11:15:18 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E889891C1 for ; Thu, 14 Jan 2021 11:15:17 +0000 (UTC) IronPort-SDR: pVS4dLHBzsNnqsvlLMSboSmeaCaCB8qDAEqn6eKNBkWLCr5Jea9mE/84MAdFHLY6Yg9hCguEvO pMMbVbe+PCeQ== X-IronPort-AV: E=McAfee;i="6000,8403,9863"; a="157528191" X-IronPort-AV: E=Sophos;i="5.79,347,1602572400"; d="scan'208";a="157528191" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jan 2021 03:15:16 -0800 IronPort-SDR: nbT9z56gow4TT/kShgWOZboDnTLkDm5kWYsFcYIchNRXcnhJNiwryc5trLN2QDUdU5XcOFF2WU KJCFqnvvFXZQ== X-IronPort-AV: E=Sophos;i="5.79,347,1602572400"; d="scan'208";a="400865451" Received: from dforourk-mobl1.ger.corp.intel.com (HELO localhost) ([10.213.254.146]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jan 2021 03:15:15 -0800 From: Jani Nikula To: Patchwork , Dave Airlie In-Reply-To: <161061890008.19649.17011974074477553738@emeril.freedesktop.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210114090522.22750-1-airlied@gmail.com> <161061890008.19649.17011974074477553738@emeril.freedesktop.org> Date: Thu, 14 Jan 2021 13:15:11 +0200 Message-ID: <87pn27py68.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBz?= =?utf-8?q?eries_starting_with_=5B01/11=5D_drm/i915=3A_refactor_some_crtc_?= =?utf-8?q?code_out_of_intel_display=2E_=28v2=29?= X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, 14 Jan 2021, Patchwork wrote: > == Series Details == > > Series: series starting with [01/11] drm/i915: refactor some crtc code out of intel display. (v2) > URL : https://patchwork.freedesktop.org/series/85846/ > State : failure > > == Summary == > > Applying: drm/i915: refactor some crtc code out of intel display. (v2) > Applying: drm/i915: refactor pll code out into intel_dpll.c > Applying: drm/i915: split fdi code out from intel_display.c > Applying: drm/i915: refactor ddi translations into a separate file > Applying: drm/i915: migrate hsw fdi code to new file. > Applying: drm/i915: migrate skl planes code new file (v3) > error: sha1 information is lacking or useless (drivers/gpu/drm/i915/Makefile). > error: could not build fake ancestor > hint: Use 'git am --show-current-patch=diff' to see the failed patch > Patch failed at 0006 drm/i915: migrate skl planes code new file (v3) > 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". My bad, just pushed some stuff that conflicted, I rebased and resent the series: https://patchwork.freedesktop.org/series/85867/ BR, Jani. > > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx