From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754385AbbKRAlv (ORCPT ); Tue, 17 Nov 2015 19:41:51 -0500 Received: from ozlabs.org ([103.22.144.67]:47688 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752013AbbKRAlu (ORCPT ); Tue, 17 Nov 2015 19:41:50 -0500 Date: Wed, 18 Nov 2015 11:41:47 +1100 From: Stephen Rothwell To: Daniel Vetter , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ville =?UTF-8?B?U3lyasOkbMOk?= , Jani Nikula Subject: linux-next: manual merge of the drm-misc tree with the drm-intel-fixes tree Message-ID: <20151118114147.0bbfbbc8@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) 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 Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_display.c between commit: 76dc3769d7c3 ("drm/i915: Don't clobber the addfb2 ioctl params") from the drm-intel-fixes tree and commit: 528344410b5c ("drm: Pass the user drm_mode_fb_cmd2 as const to .fb_create()") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). BTW, that drm-misc patch looks incomplete without the drm-intel-fixes patch and presumably caused a new build warning (unless you only tested the combined branches). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index 98eaea3e5ed6,e78bd7f69d72..000000000000 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@@ -14583,14 -14364,12 +14583,14 @@@ static int intel_framebuffer_init(struc static struct drm_framebuffer * intel_user_framebuffer_create(struct drm_device *dev, struct drm_file *filp, - struct drm_mode_fb_cmd2 *user_mode_cmd) - const struct drm_mode_fb_cmd2 *mode_cmd) ++ const struct drm_mode_fb_cmd2 *user_mode_cmd) { + struct drm_framebuffer *fb; struct drm_i915_gem_object *obj; + struct drm_mode_fb_cmd2 mode_cmd = *user_mode_cmd; obj = to_intel_bo(drm_gem_object_lookup(dev, filp, - mode_cmd->handles[0])); + mode_cmd.handles[0])); if (&obj->base == NULL) return ERR_PTR(-ENOENT);