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 8ECC1C33CB3 for ; Tue, 28 Jan 2020 09:16:35 +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 68DE02467E for ; Tue, 28 Jan 2020 09:16:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 68DE02467E 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 0773F6ED3F; Tue, 28 Jan 2020 09:16:35 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 785996ED3F for ; Tue, 28 Jan 2020 09:16:33 +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 fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Jan 2020 01:16:31 -0800 X-IronPort-AV: E=Sophos;i="5.70,373,1574150400"; d="scan'208";a="222027795" Received: from vogginge-mobl.ger.corp.intel.com (HELO localhost) ([10.252.38.155]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Jan 2020 01:16:29 -0800 From: Jani Nikula To: Patchwork , Pankaj Bharadiya In-Reply-To: <158015840134.9687.7990172392824281702@emeril.freedesktop.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200127075653.8523-1-pankaj.laxminarayan.bharadiya@intel.com> <158015840134.9687.7990172392824281702@emeril.freedesktop.org> Date: Tue, 28 Jan 2020 11:16:31 +0200 Message-ID: <87o8uo9c0g.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBk?= =?utf-8?q?rm=3A_Introduce_struct_drm=5Fdevice_based_WARN*_and_use_them_in?= =?utf-8?q?_i915_=28rev4=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 Mon, 27 Jan 2020, Patchwork wrote: > == Series Details == > > Series: drm: Introduce struct drm_device based WARN* and use them in i915 (rev4) > URL : https://patchwork.freedesktop.org/series/72035/ > State : failure I think the repeated attempts with the patches prove that it's really hard to get patches with such wide impact merged. The driver moves so fast that things like this probably need to be split up more. For example per file. It will result in a lot of patches, but at least we could merge the patches that don't conflict, and keep moving forward. It's also maybe a bad timing, lots of changes like this going on atm. BR, Jani. > > == Summary == > > Applying: drm/i915/display: Make WARN* drm specific where drm_device ptr is available > Using index info to reconstruct a base tree... > M drivers/gpu/drm/i915/display/intel_display.c > M drivers/gpu/drm/i915/display/intel_dp.c > M drivers/gpu/drm/i915/display/intel_dpll_mgr.c > M drivers/gpu/drm/i915/display/intel_hdmi.c > M drivers/gpu/drm/i915/display/intel_hotplug.c > M drivers/gpu/drm/i915/display/intel_lvds.c > M drivers/gpu/drm/i915/display/intel_pipe_crc.c > M drivers/gpu/drm/i915/display/intel_sdvo.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/i915/display/intel_sdvo.c > Auto-merging drivers/gpu/drm/i915/display/intel_pipe_crc.c > Auto-merging drivers/gpu/drm/i915/display/intel_lvds.c > Auto-merging drivers/gpu/drm/i915/display/intel_hotplug.c > Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdmi.c > Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c > Auto-merging drivers/gpu/drm/i915/display/intel_dp.c > Auto-merging drivers/gpu/drm/i915/display/intel_display.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.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/display: Make WARN* drm specific where drm_device ptr is available > 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". > > _______________________________________________ > 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