Subject: Re: [PATCH] ARM: dts: k2*: Rename the k2* files to keystone-k2* files
To: Nishanth Menon <nm@ti.com>
References: <1458139150-30382-1-git-send-email-nm@ti.com>
 <56E97F0E.6070309@oracle.com>
 <CAGo_u6oMYZvzkvCsi8H3hvOBrPLZ-EL-T3RCA6E8BnmThrLYfA@mail.gmail.com>
Cc: Santosh Shilimkar <ssantosh@kernel.org>, Olof Johansson <olof@lixom.net>,
        dt list <devicetree@vger.kernel.org>,
        Russell King <linux@arm.linux.org.uk>,
        lkml <linux-kernel@vger.kernel.org>,
        "linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>
From: "santosh.shilimkar@oracle.com" <santosh.shilimkar@oracle.com>
Organization: Oracle Corporation
Message-ID: <5706A97E.7090002@oracle.com>
Date: Thu, 7 Apr 2016 11:39:58 -0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0)
 Gecko/20100101 Thunderbird/38.7.2
MIME-Version: 1.0
In-Reply-To: <CAGo_u6oMYZvzkvCsi8H3hvOBrPLZ-EL-T3RCA6E8BnmThrLYfA@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1565
Lines: 48

On 4/7/16 10:01 AM, Nishanth Menon wrote:
> Hi Santosh,
>
> On Wed, Mar 16, 2016 at 10:43 AM, santosh shilimkar
> <santosh.shilimkar@oracle.com> wrote:
>> On 3/16/2016 7:39 AM, Nishanth Menon wrote:
>>>
>>> As reported in [1], rename the k2* dts files to keystone-* files
>>> this will force consistency throughout.
>>>
>>> Script for the same (and hand modified for Makefile and MAINTAINERS
>>> files):
>>> for i in arch/arm/boot/dts/k2*
>>> do
>>>          b=`basename $i`;
>>>          git mv $i arch/arm/boot/dts/keystone-$b;
>>>          sed -i -e "s/$b/keystone-$b/g" arch/arm/boot/dts/*[si]
>>> done
>>>
>>> NOTE: bootloaders that depend on older dtb names will need to be
>>> updated as well.
>>>
>>> [1] http://marc.info/?l=linux-arm-kernel&m=145637407804754&w=2
>>>
>>> Reported-by: Olof Johansson <olof@lixom.net>
>>> Signed-off-by: Nishanth Menon <nm@ti.com>
>>> ---
>>>
>> Thanks Nishant for taking care of this. I will add this to the
>> next soon.
>>
>
> I dont see this in 4.6-rc2 yet.. did this slip our pull request? will
> be good to get this in so that we can fix up u-boot consistently.
>
As discussed already, the 4.6 merge window contained the k2g renames
as you can see from the pull request[1]. The other rename was suppose
to be for 4.7 so that it lives in next for sometime for users to get
the time to get to update the bootloaders etc.

So it didn't slip pull request but just happen to go in 4.7 pull
request. I added that to next early for testing. Hope it
clarifies.

Regards,
Santosh

[1] https://patchwork.ozlabs.org/patch/588386/