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 6FF01C3F2C6 for ; Tue, 3 Mar 2020 15:20:59 +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 5003A2073D for ; Tue, 3 Mar 2020 15:20:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5003A2073D 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 E74288999A; Tue, 3 Mar 2020 15:20:58 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id E29FD6E44F for ; Tue, 3 Mar 2020 15:20:57 +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 fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Mar 2020 07:20:57 -0800 X-IronPort-AV: E=Sophos;i="5.70,511,1574150400"; d="scan'208";a="233647223" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.161]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Mar 2020 07:20:55 -0800 From: Jani Nikula To: Patchwork , Wambui Karuga In-Reply-To: <158324146545.15379.18277725887373195007@emeril.freedesktop.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200226101138.15435-1-wambui.karugax@gmail.com> <158324146545.15379.18277725887373195007@emeril.freedesktop.org> Date: Tue, 03 Mar 2020 17:20:52 +0200 Message-ID: <87fteppiqz.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBk?= =?utf-8?q?rm/i915/display=3A_conversion_to_drm=5Fdevice_based_logging_mac?= =?utf-8?q?ros_=28rev5=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 Tue, 03 Mar 2020, Patchwork wrote: > == Series Details == > > Series: drm/i915/display: conversion to drm_device based logging macros (rev5) > URL : https://patchwork.freedesktop.org/series/72760/ > State : failure > > == Summary == > > Applying: drm/i915/dsb: convert to drm_device based logging macros. > Applying: drm/i915/fbc: convert to drm_device based logging macros. > Applying: drm/i915/fbdev: convert to drm_device based logging. > Applying: drm/i915/fifo_underrun: convert to drm_device based logging. > Applying: drm/i915/gmbus: convert to drm_device based logging, > Applying: drm/i915/hdcp: convert to struct drm_device based logging. > Using index info to reconstruct a base tree... > M drivers/gpu/drm/i915/display/intel_hdcp.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch' to see the failed patch > Patch failed at 0006 drm/i915/hdcp: convert to struct drm_device based logging. > 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". Wambui, please rebase and resend the entire series. It's been a bit unlucky in CI, getting failures until it doesn't apply anymore. :( BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx