[PATCH v3] ARM: dts: kirkwood: add device tree for buffalo linkstation ls-qvl

[Roger Shimizu]

On Tue, Jan 26, 2016 at 7:15 PM, Gregory CLEMENT
<gregory.clement at free-electrons.com> wrote:
>  On mar., janv. 26 2016, Roger Shimizu <rogershimizu at gmail.com> wrote:
>> For that ls-wvl patch, "git am <patch 07>" would fail,
>> but after "patch -p1 < .git/rebase-apply/patch", and then "git add -A;
>> git am --continue", that patch can be applied.
>> After that, I can successfully apply this ls-qvl patch.
>>
>> I'm not sure whether you use "git am" to apply patches.
>> Maybe you use other similar ways. Please try and let me know if still
>> need my rebase.
>
> Usually I applied the patch directly from emacs, which call a kind of
> git am. However your patches did not apply directly, I had to reduce the
> context by using git am -C2. I did it for the patch 5 and 6, and I
> forgot ot do it for patch 7. Now it is done and indeed this patch
> applied well ontop of it.

Learned that "git am" can try -C2 when there's small conflicts.
And glad to hear that all my work got applied well.
Thank you!

Cheers,
Roger