From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754793AbbHNCGS (ORCPT ); Thu, 13 Aug 2015 22:06:18 -0400 Received: from ozlabs.org ([103.22.144.67]:38937 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752919AbbHNCGR (ORCPT ); Thu, 13 Aug 2015 22:06:17 -0400 Date: Fri, 14 Aug 2015 12:06:15 +1000 From: Stephen Rothwell To: Daniel Vetter , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thierry Reding Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20150814120615.2c73b7e4@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (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/drm_irq.c between commit: 209e4dbc8dcd ("drm/vblank: Use u32 consistently for vblank counters") from Linus' tree and commit: b90180b057f7 ("drm/irq: More pipe/crtc consistency cleanups") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/gpu/drm/drm_irq.c index ee14324522ce,70919d48f015..000000000000 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@@ -74,11 -74,11 +74,11 @@@ module_param_named(vblankoffdelay, drm_ module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600); module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600); - static void store_vblank(struct drm_device *dev, int crtc, + static void store_vblank(struct drm_device *dev, unsigned int pipe, - unsigned vblank_count_inc, + u32 vblank_count_inc, struct timeval *t_vblank) { - struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; + struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; u32 tslot; assert_spin_locked(&dev->vblank_time_lock);