Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752692AbdCTAwb (ORCPT ); Sun, 19 Mar 2017 20:52:31 -0400 Received: from ozlabs.org ([103.22.144.67]:46067 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752151AbdCTAw3 (ORCPT ); Sun, 19 Mar 2017 20:52:29 -0400 Date: Mon, 20 Mar 2017 11:51:28 +1100 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , Intel Graphics , DRI Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Wilson , Jani Nikula Subject: linux-next: build failure after merge of the drm tree Message-ID: <20170320115128.0bc3861b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1864 Lines: 43 Hi Dave, After merging the drm tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i915/i915_irq.c: In function 'gen6_rps_reset_ei': drivers/gpu/drm/i915/i915_irq.c:1115:38: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei' vlv_c0_read(dev_priv, &dev_priv->rps.down_ei); ^ drivers/gpu/drm/i915/i915_irq.c:1116:15: error: 'struct intel_gen6_power_mgmt' has no member named 'up_ei' dev_priv->rps.up_ei = dev_priv->rps.down_ei; ^ drivers/gpu/drm/i915/i915_irq.c:1116:37: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei' dev_priv->rps.up_ei = dev_priv->rps.down_ei; ^ drivers/gpu/drm/i915/i915_irq.c: In function 'vlv_wa_c0_ei': drivers/gpu/drm/i915/i915_irq.c:1133:21: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei' &dev_priv->rps.down_ei, &now, ^ drivers/gpu/drm/i915/i915_irq.c:1136:16: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei' dev_priv->rps.down_ei = now; ^ drivers/gpu/drm/i915/i915_irq.c:1141:20: error: 'struct intel_gen6_power_mgmt' has no member named 'up_ei' &dev_priv->rps.up_ei, &now, ^ drivers/gpu/drm/i915/i915_irq.c:1144:16: error: 'struct intel_gen6_power_mgmt' has no member named 'up_ei' dev_priv->rps.up_ei = now; ^ Caused by commit 8f68d591d476 ("drm/i915: Stop using RP_DOWN_EI on Baytrail") from the drm-intel-fixes tree and a bad merge resolution on my part. I reapplied that commit by hand. It would be nice if this conflict was resolved in the drm tree. This cherry picking of fixes from new development back to Linus' tree can be a real pain when so many other changes happen in the same files. -- Cheers, Stephen Rothwell