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=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 AB8BDC10F27 for ; Wed, 11 Mar 2020 10:46:50 +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 89A4D20848 for ; Wed, 11 Mar 2020 10:46:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 89A4D20848 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 21D756E970; Wed, 11 Mar 2020 10:46:50 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id BCFB56E972 for ; Wed, 11 Mar 2020 10:46:48 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Mar 2020 03:46:48 -0700 X-IronPort-AV: E=Sophos;i="5.70,540,1574150400"; d="scan'208";a="236398513" Received: from mkuta-mobl.ger.corp.intel.com (HELO localhost) ([10.249.39.69]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Mar 2020 03:46:46 -0700 From: Jani Nikula To: Patchwork , Mario Kleiner In-Reply-To: <158343831517.17237.10748442764769008781@emeril.freedesktop.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200305081219.2900-1-mario.kleiner.de@gmail.com> <158343831517.17237.10748442764769008781@emeril.freedesktop.org> Date: Wed, 11 Mar 2020 12:47:03 +0200 Message-ID: <87r1xzkw2g.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBk?= =?utf-8?q?rm/i915/dp=3A_Add_dpcd_link=5Frate_quirk_for_Apple_15=22_MBP_20?= =?utf-8?b?MTcgKHJldjIp?= 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, 05 Mar 2020, Patchwork wrote: > == Series Details == > > Series: drm/i915/dp: Add dpcd link_rate quirk for Apple 15" MBP 2017 (rev2) > URL : https://patchwork.freedesktop.org/series/74100/ > State : failure > > == Summary == > > Applying: drm/i915/dp: Add dpcd link_rate quirk for Apple 15" MBP 2017 (v2) > Using index info to reconstruct a base tree... > M drivers/gpu/drm/drm_dp_helper.c > M drivers/gpu/drm/i915/display/intel_dp.c > M include/drm/drm_dp_helper.h > Falling back to patching base and 3-way merge... > Auto-merging include/drm/drm_dp_helper.h > CONFLICT (content): Merge conflict in include/drm/drm_dp_helper.h > Auto-merging drivers/gpu/drm/i915/display/intel_dp.c > Auto-merging drivers/gpu/drm/drm_dp_helper.c > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch' to see the failed patch > Patch failed at 0001 drm/i915/dp: Add dpcd link_rate quirk for Apple 15" MBP 2017 (v2) > 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". I missed that this fails to apply, please rebase on top of current drm-tip and repost. Thanks, 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