Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752200AbaGKLao (ORCPT ); Fri, 11 Jul 2014 07:30:44 -0400 Received: from mail-ig0-f174.google.com ([209.85.213.174]:39211 "EHLO mail-ig0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751485AbaGKLan (ORCPT ); Fri, 11 Jul 2014 07:30:43 -0400 Date: Fri, 11 Jul 2014 12:30:37 +0100 From: Lee Jones To: Peter Griffin Cc: Kishon Vijay Abraham I , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@stlinux.com Subject: Re: [STLinux Kernel] [PATCH v3 0/5] phy: miphy365x: Introduce support for MiPHY365x Message-ID: <20140711113037.GD30519@lee--X1> References: <1404906074-31992-1-git-send-email-lee.jones@linaro.org> <53BD572C.4060406@ti.com> <20140710153548.GB26886@griffinp-ThinkPad-X1-Carbon-2nd> <20140711103104.GC30519@lee--X1> <20140711110547.GA23439@griffinp-ThinkPad-X1-Carbon-2nd> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20140711110547.GA23439@griffinp-ThinkPad-X1-Carbon-2nd> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 11 Jul 2014, Peter Griffin wrote: > On Fri, 11 Jul 2014, Lee Jones wrote: > > > One small point, patch 5 which adds the DT nodes may not apply as the file got > > > renamed from stih416-b2020-revE.dts to stih416-b2020e.dts. > > > > Not required, Git should handle this seamlessly. > > I didn't ask you to do anything. Ah, I misread, my bad. > Also when I made the same mistake, GIT > did not handle it seamlessly and I got the following query > from Ulf http://www.mail-archive.com/devicetree@vger.kernel.org/msg33926.html Oh, it looks like the renaming patch went into -rc3 as part of Max's -fixes branch. I assumed it would go in via -next. This is different, so yes, it will have to be rebased onto -rc3. Maxime, Do you want me to do that, or are you happy to? > So in case Kishon has the same problem I thought I'd do a pre-emptive strike! Yes, good call. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/