arm-soc: Xilinx Zynq DT changes for v3.12
monstr at monstr.eu
Wed Aug 14 01:50:01 EDT 2013
On 08/14/2013 02:18 AM, Kevin Hilman wrote:
> Kevin Hilman <khilman at linaro.org> writes:
>> Hi Michal,
>> Michal Simek <monstr at monstr.eu> writes:
>>> Hi Arnd and Olof,
>> I'm now helping out with arm-soc maintenance as well, and am on the
>> arm at kernel.org alias, so thanks for Cc'ing it.
>>> please pull this simple DT change to your tree.
>> Pulled into next/dt.
>> In the future, it makes things simpler for us if you base on older -rc
>> releases where possible (c.f. similar request by Olof.) In this
>> case, it was trivial for me to rebase it onto -rc1 so I've done that
>> before applying.
> Looking closer (thanks to Olof), since your tree is already in
> linux-next, my rebasing this would cause problems in -next, so I can't
> rebase it.
That's correct but as you probably noticed this branch is not merged
to linux-next. (Only arm-next branch is added there). I want ask Stephen
for removing this branch anyway.
> Either you can rebase it to an earlier -rc (preferred), or I can pull in
> -rc5 into next/dt (which is currently causing an unrelated conflict
> which I'll have to deal with tomorrow.)
I wasn't aware about using earlier -rc. The last information I got
is that these trees should be based on Linux -rc (or tagged if you like) version.
I will keep this in my mind and will use earlier versions in the next pull requests.
It is just one single patch and I believe you have to use rc5
and resolve that all conflicts anyway that's why it is just question
of time when you have to deal with it.
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 263 bytes
Desc: OpenPGP digital signature
More information about the linux-arm-kernel