From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751679Ab0DLFG5 (ORCPT ); Mon, 12 Apr 2010 01:06:57 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:53571 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750983Ab0DLFG4 (ORCPT ); Mon, 12 Apr 2010 01:06:56 -0400 Date: Mon, 12 Apr 2010 15:06:51 +1000 From: Stephen Rothwell To: Dave Airlie Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Skeggs Subject: linux-next: manual merge of the drm tree with Linus' tree Message-Id: <20100412150651.4dd8d6d7.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.1 (GTK+ 2.20.0; i486-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 Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/nouveau/nouveau_drv.h between commit 952eb63543552deb1bf1113739d59d29172d7755 ("drm/nouveau: remove some unused members from drm_nouveau_private") from Linus' tree and commit 386516744ba45d50f42c6999151cc210cb4f96e4 ("drm/fb: fix fbdev object model + cleanup properly") from the drm tree. Just context changes. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/gpu/drm/nouveau/nouveau_drv.h index ace630a,941339c..0000000 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@@ -533,8 -531,7 +533,6 @@@ struct drm_nouveau_private atomic_t validate_sequence; } ttm; - struct fb_info *fbdev_info; - - int fifo_alloc_count; struct nouveau_channel *fifos[NOUVEAU_MAX_CHANNEL_NR]; struct nouveau_engine engine;