From patchwork Thu Sep 5 07:55:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 2853951 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 543E6C0AB5 for ; Thu, 5 Sep 2013 07:55:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6CB2420259 for ; Thu, 5 Sep 2013 07:55:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9A6220249 for ; Thu, 5 Sep 2013 07:55:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757669Ab3IEHzL (ORCPT ); Thu, 5 Sep 2013 03:55:11 -0400 Received: from haggis.pcug.org.au ([203.10.76.10]:33508 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756186Ab3IEHzK (ORCPT ); Thu, 5 Sep 2013 03:55:10 -0400 Received: from canb.auug.org.au (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by members.tip.net.au (Postfix) with ESMTPSA id 543CE164155; Thu, 5 Sep 2013 17:55:06 +1000 (EST) Date: Thu, 5 Sep 2013 17:55:03 +1000 From: Stephen Rothwell To: Linus Torvalds Cc: David Herrmann , Tomi Valkeinen , linux-kernel , linux-fbdev , Ingo Molnar , Jean-Christophe PLAGNIOL-VILLARD Subject: Re: [GIT PULL] fbdev changes for 3.12 Message-Id: <20130905175503.a4320c0f875712bc68c32cf7@canb.auug.org.au> In-Reply-To: References: <5228294E.8050401@ti.com> X-Mailer: Sylpheed 3.4.0beta4 (GTK+ 2.24.20; 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=-9.3 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 Thu, 5 Sep 2013 09:48:18 +0200 David Herrmann wrote: > > On Thu, Sep 5, 2013 at 8:48 AM, Tomi Valkeinen wrote: > > > > Here are the fbdev changes for 3.12. > > > > There's a conflict in drivers/video/simplefb.c, which you can resolve by using > > the version in your tree. > > No, both need to be merged. The current version lacks support for > ABGR8888. The fbdev tree lacks the DRM format, which should be: > { "a8b8g8r8", 32, {0, 8}, {8, 8}, {16, 8}, {24, 8}, DRM_FORMAT_ABGR8888 } > > > I guess the simplefb changes were taken through Ingo's tree because the series > > includes x86 arch changes, but it would have been nice to see the patches in > > the linux-next... > > simplefb was in linux-next. I also acked the fixup from Stephen. See > this commit from a pre-3.12 -next tree: > http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/platform_data/simplefb.h?id=44ed8fb588e517a2ef917c6757ee11ee47348978 In case it is not obvious, this is the extra merge fix patch I have been carrying (after using the version of drivers/video/simplefb.c from the tip tree - which is already in your tree): From: Stephen Rothwell Date: Wed, 14 Aug 2013 14:29:27 +1000 Subject: [PATCH] simplefb: merge conflict fix Signed-off-by: Stephen Rothwell --- include/linux/platform_data/simplefb.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/platform_data/simplefb.h b/include/linux/platform_data/simplefb.h index 53774b0..c395d4c 100644 --- a/include/linux/platform_data/simplefb.h +++ b/include/linux/platform_data/simplefb.h @@ -27,6 +27,7 @@ { "a8r8g8b8", 32, {16, 8}, {8, 8}, {0, 8}, {24, 8}, DRM_FORMAT_ARGB8888 }, \ { "x2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {0, 0}, DRM_FORMAT_XRGB2101010 }, \ { "a2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {30, 2}, DRM_FORMAT_ARGB2101010 }, \ + { "a8b8g8r8", 32, {0, 8}, {8, 8}, {16, 8}, {24, 8}, DRM_FORMAT_ABGR8888 }, \ } /*