Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752447AbaKJKki (ORCPT ); Mon, 10 Nov 2014 05:40:38 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:49658 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751977AbaKJKkg (ORCPT ); Mon, 10 Nov 2014 05:40:36 -0500 Message-ID: <546095EC.2040501@st.com> Date: Mon, 10 Nov 2014 11:39:40 +0100 From: Maxime Coquelin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Lee Jones , Kishon Vijay Abraham I Cc: Gabriel FERNANDEZ , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Srinivas Kandagatla , Patrice Chotard , Russell King , Grant Likely , , , , , Gabriel Fernandez Subject: Re: [PATCH v5 2/8] phy: miphy28lp: Add PHY header file for DT x Driver defines References: <1415098284-11182-1-git-send-email-gabriel.fernandez@linaro.org> <1415098284-11182-3-git-send-email-gabriel.fernandez@linaro.org> <545B1C53.9010406@ti.com> <545B3FA4.8040109@st.com> <20141106112825.GC26543@x1> <545B6144.2020503@st.com> <20141106153659.GD26543@x1> <545B9F15.5070404@st.com> <20141107130538.GB3745@x1> In-Reply-To: <20141107130538.GB3745@x1> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.251.17.209] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.12.52,1.0.28,0.0.0000 definitions=2014-11-10_01:2014-11-07,2014-11-09,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/07/2014 02:05 PM, Lee Jones wrote: > If the merge turns out to be simple, then Git will do the correct > thing; however, if the first version of the patch is applied, then > some changes around the same area of the file occur _then_ when the > second version (of the same patch differing only by SHA1) is applied > Git will get confused. If it has the same SHA1 however, Git will > discard it as 'already applied'. This is the reason we pass around > shared tags to immutable branches. Looking at how the patch is trivial, I persist to think there is no issue. But OK, I will prepare an immutable branch.. Kishon, checkpatch complains because this new file has no maintainer. Is it ok for you if I add it to the Generic PHY subsystem? Regards, Maxime -- 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/