From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Brown Subject: Re: [PATCH] regulator: deprecate regulator-compatible DT property Date: Sat, 22 Sep 2012 11:56:20 -0400 Message-ID: <20120922155620.GR4495@opensource.wolfsonmicro.com> References: <1348178697-26314-1-git-send-email-swarren@wwwdotorg.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1348178697-26314-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: "devicetree-discuss" To: Stephen Warren Cc: Stephen Warren , devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Herring , Laxman Dewangan , Liam Girdwood List-Id: devicetree@vger.kernel.org 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.