From mboxrd@z Thu Jan 1 00:00:00 1970 From: gregory.clement@free-electrons.com (Gregory CLEMENT) Date: Tue, 26 Jan 2016 11:15:15 +0100 Subject: [PATCH v3] ARM: dts: kirkwood: add device tree for buffalo linkstation ls-qvl In-Reply-To: (Roger Shimizu's message of "Tue, 26 Jan 2016 19:06:16 +0900") References: <1453652964-21489-1-git-send-email-rogershimizu@gmail.com> <1453740250-16765-1-git-send-email-rogershimizu@gmail.com> <87zivtd21i.fsf@free-electrons.com> <87vb6hd0hh.fsf@free-electrons.com> Message-ID: <87a8nsd4uk.fsf@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Roger, On mar., janv. 26 2016, Roger Shimizu wrote: > [lists seems rejected my previous email, so re-send] I think tt was rejected because you changed the topic > > Dear Gregory, > > On Tue, Jan 26, 2016 at 2:37 AM, Gregory CLEMENT > wrote: >> Hi Roger, >> >> On lun., janv. 25 2016, Roger Shimizu wrote: >> >>> On Tue, Jan 26, 2016 at 2:03 AM, Gregory CLEMENT >>> wrote: >>>> >>>> Thanks for all your work, I was about to apply it but as I already >>>> applied your previous patches I didn't manage to do it. >>>> >>>> >>>> Would you mind rebasing your patch on the mvebu/dt branch that I have >>>> just push on git://git.infradead.org/linux-mvebu.git ? > > I find you missed one of my patches on "mvebu/dt" branch: > >> - [patch 7/7] split dts for lswvl [0] Indeed I didn't applied it. > > [0]: http://lists.infradead.org/pipermail/linux-arm-kernel/2016-January/400937.html > > For that ls-wvl patch, "git am " 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. Thanks! > Thank you! > > Cheers, > Roger > -- > Roger Shimizu, GMT +9 Tokyo > PGP/GPG: 17B3ACB1 -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com