From patchwork Wed Apr 9 23:04:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 3957931 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CA6F8BFF02 for ; Wed, 9 Apr 2014 23:10:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D0B92063D for ; Wed, 9 Apr 2014 23:10:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F86A2063B for ; Wed, 9 Apr 2014 23:10:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933287AbaDIXK3 (ORCPT ); Wed, 9 Apr 2014 19:10:29 -0400 Received: from ozlabs.org ([103.22.144.67]:49142 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933177AbaDIXK3 (ORCPT ); Wed, 9 Apr 2014 19:10:29 -0400 X-Greylist: delayed 327 seconds by postgrey-1.27 at vger.kernel.org; Wed, 09 Apr 2014 19:10:28 EDT Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 4696014008B; Thu, 10 Apr 2014 09:04:58 +1000 (EST) Date: Thu, 10 Apr 2014 09:04:53 +1000 From: Stephen Rothwell To: Linus Torvalds Cc: Tomi Valkeinen , linux-kernel , linux-fbdev , Jean-Christophe PLAGNIOL-VILLARD Subject: Re: [GIT PULL] fbdev reorder for 3.15 Message-Id: <20140410090453.ef611201b91c4b3dbb2a9af4@canb.auug.org.au> In-Reply-To: References: <5345258C.1070308@ti.com> X-Mailer: Sylpheed 3.4.1 (GTK+ 2.24.23; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Linus, On Wed, 9 Apr 2014 12:23:47 -0700 Linus Torvalds wrote: > > Are there other things pending in this area? Because if there are, I > think I'll take you up on your "or we can rebase on top of -rc1" offer > instead. I have only 2 other commits that touch drivers/video in linux-next and they are both from Tomi and both only touch a couple of files in drivers/video/omap2/dss (and drivers/video/fbdev/omap2/dss/ since one of them is based after the move). I also have the following merge fix patch in linux-next (maybe you already have this in the test merge branches): From: Stephen Rothwell Date: Tue, 4 Mar 2014 16:11:12 +1100 Subject: [PATCH] video: fbdev: fix up for removal of SGI Visual Workstation Signed-off-by: Stephen Rothwell --- drivers/video/fbdev/Kconfig | 11 +---------- drivers/video/fbdev/Makefile | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 31c3f3ddfd38..6b1984c7f4e7 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -765,18 +765,9 @@ config FB_HGA As this card technology is at least 25 years old, most people will answer N here. -config FB_SGIVW - tristate "SGI Visual Workstation framebuffer support" - depends on FB && X86_VISWS - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - SGI Visual Workstation support for framebuffer graphics. - config FB_GBE bool "SGI Graphics Backend frame buffer support" - depends on (FB = y) && (SGI_IP32 || X86_VISWS) + depends on (FB = y) && SGI_IP32 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index 6ef2c66110e3..0284f2a12538 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -55,7 +55,6 @@ obj-$(CONFIG_FB_CG14) += cg14.o sbuslib.o obj-$(CONFIG_FB_P9100) += p9100.o sbuslib.o obj-$(CONFIG_FB_TCX) += tcx.o sbuslib.o obj-$(CONFIG_FB_LEO) += leo.o sbuslib.o -obj-$(CONFIG_FB_SGIVW) += sgivwfb.o obj-$(CONFIG_FB_ACORN) += acornfb.o obj-$(CONFIG_FB_ATARI) += atafb.o c2p_iplan2.o atafb_mfb.o \ atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o