From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752991Ab2IWBkU (ORCPT ); Sat, 22 Sep 2012 21:40:20 -0400 Received: from avon.wwwdotorg.org ([70.85.31.133]:39080 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752413Ab2IWBkS (ORCPT ); Sat, 22 Sep 2012 21:40:18 -0400 Message-ID: <505E687F.2060404@wwwdotorg.org> Date: Sat, 22 Sep 2012 19:40:15 -0600 From: Stephen Warren User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: Mark Brown CC: Liam Girdwood , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, Rob Herring , Grant Likely , Laxman Dewangan , AnilKumar Ch , Stephen Warren Subject: Re: [PATCH] regulator: deprecate regulator-compatible DT property References: <1348178697-26314-1-git-send-email-swarren@wwwdotorg.org> <20120922155620.GR4495@opensource.wolfsonmicro.com> In-Reply-To: <20120922155620.GR4495@opensource.wolfsonmicro.com> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/22/2012 09:56 AM, Mark Brown wrote: > On Thu, Sep 20, 2012 at 04:04:57PM -0600, Stephen Warren wrote: > >> Mark, if this gets into 3.7, I can fix up all the Tegra .dts files during 3.8. > > I don't know which branch you generated this against but it doesn't > apply to any of the obvious branches in my regulator tree. There's a > modify/delete conflict in > > Documentation/devicetree/bindings/regulator/max8907.txt > > which I don't seem to have. Oh right, that file would only be in the MFD tree. I assume that given you attempted to apply it, there are no conceptual issues applying it once I split it up into patches for each subsystem?