From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexey Charkov Subject: Re: [PATCHv4 0/9] *** ARM: Update arch-vt8500 to Devicetree *** Date: Fri, 24 Aug 2012 09:54:25 +0400 Message-ID: References: <1345707346-9035-1-git-send-email-linux@prisktech.co.nz> <201208231322.23077.arnd@arndb.de> <1345758702.2061.6.camel@gitbox> <201208240540.12316.arnd@arndb.de> <1345787536.23177.3.camel@gitbox> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1345787536.23177.3.camel@gitbox> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: vt8500-wm8505-linux-kernel@googlegroups.com Cc: "a.zummo@towertech.it" , "linux-fbdev@vger.kernel.org" , "linux@arm.linux.org.uk" , "linus.walleij@stericsson.com" , "rtc-linux@googlegroups.com" , "FlorianSchandinat@gmx.de" , "gregkh@linuxfoundation.org" , "devicetree-discuss@lists.ozlabs.org" , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "rob.herring@calxeda.com" , "grant.likely@secretlab.ca" , "rob@landley.net" , "linux-serial@vger.kernel.org" , "swarren@nvidia.com" , "mturquette@ti.com" List-Id: devicetree@vger.kernel.org 2012/8/24 Tony Prisk : > On Fri, 2012-08-24 at 05:40 +0000, Arnd Bergmann wrote: >> On Thursday 23 August 2012, Tony Prisk wrote: >> > I was about to say that if Mike has any issues with the driver that I >> > can fix the patch conflict at the same time, but I just realised that >> > its more work than I originally thought :) >> > >> > I was going to move the arch-vt8500 part of the clocks patch back into >> > the clocks patch - but that will just move the issue from arm-soc to >> > clocks because Mike's branch won't have the arch-vt8500 patch so the >> > patch will fail. >> >> But that's ok, because without the arch-v8500 part, nothing uses >> the vt8500-clock driver, so nothing breaks. You can introduce broken >> code in the meantime as long as it's impossible to enable and it will >> work afterwards. >> >> Arnd > > You lost me a little bit there :) > If it stays as is now, the arch-vt8500 patch will introduce an > unresolved symbol. > If I move the clock code from the arch-vt8500 patch to the clock patch, > then the clock patch won't apply because it needs the arch-vt8500 patch > first and Mike won't have that patch, but it would be fine if both > patches went in via your tree. Why don't you add a #define in the first patch that makes your to-be-unresolved symbol a no-op and then drop it within the clock patch? Best, Alexey