From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomi Valkeinen Subject: Re: [GIT PULL] OMAP DSS changes for .38 merge window Date: Fri, 07 Jan 2011 16:06:56 +0200 Message-ID: <1294409216.3968.97.camel@nubuntu> References: <1294404103.3968.56.camel@nubuntu> <20110107132541.GA31660@linux-sh.org> <1294407452.3968.81.camel@nubuntu> <20110107135217.GA3760@linux-sh.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mgw-da01.ext.nokia.com ([147.243.128.24]:43268 "EHLO mgw-da01.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751322Ab1AGOHA (ORCPT ); Fri, 7 Jan 2011 09:07:00 -0500 In-Reply-To: <20110107135217.GA3760@linux-sh.org> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: ext Paul Mundt Cc: "linux-fbdev@vger.kernel.org" , "linux-omap@vger.kernel.org" , ext Tony Lindgren On Fri, 2011-01-07 at 22:52 +0900, ext Paul Mundt wrote: > Hmm, I've just fast-forwarded to Linus's current tree and tried to pull > your rebase branch in, but it seems to have a board conflict with the > OMAP tree merge: > > CONFLICT (delete/modify): arch/arm/mach-omap2/board-zoom2.c deleted in HEAD and modified in 122ffebf2191529153c079b457e38ca3829eac40. Version 122ffebf2191529153c079b457e38ca3829eac40 of arch/arm/mach-omap2/board-zoom2.c left in tree. > > Additionally there's a board-zoom.c conflict that looks like this: Ah. I'll have to fix that. Let's leave this until Monday, as I don't have a board here to test the fixes. Tomi