From: Aida Mynzhasova <aida.mynzhasova@skitlab•ru>
To: David Miller <davem@davemloft•net>
Cc: devicetree@vger•kernel.org, linuxppc-dev@lists•ozlabs.org,
greg@kroah•com
Subject: Re: "powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file" was added twice
Date: Mon, 14 Oct 2013 09:52:13 +0400 [thread overview]
Message-ID: <525B868D.9080806@skitlab.ru> (raw)
In-Reply-To: <20131012.171110.246440214474931440.davem@davemloft.net>
On 13.10.2013 01:11, David Miller wrote:
> From: Aida Mynzhasova <aida.mynzhasova@skitlab•ru>
> Date: Sat, 12 Oct 2013 18:54:42 +0400
>
>> Hi,
>>
>> recently I looked through commits in kernel/git/torvalds/linux.git and
>> I noticed that my patch (old and new version) was added twice (by
>> David S. Miller):
>>
>> e58f6f4fb4eada7867014bfaec898f03afbce5c2
>> 894116bd0e9b7749a0c4b6c62dec13c2a0ccef68
>>
>> I think this is not good, and only
>> e58f6f4fb4eada7867014bfaec898f03afbce5c2 should be added.
>
> Read the code history properly.
>
> First 894116bd0e9b7749a0c4b6c62dec13c2a0ccef68 got applied, as you say
> accidently. Then I reverted it, see commit
> 3f3f0960aff951c5df6e42ce292d1593a2520646.
>
> Then I applied the correct version which is commit
> e58f6f4fb4eada7867014bfaec898f03afbce5c2.
>
> I didn't respond at all the first time you pointed this out hoping
> you would figure it out on your own.
>
Oh...right...
Please accept my apology.
prev parent reply other threads:[~2013-10-14 5:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 14:54 "powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file" was added twice Aida Mynzhasova
2013-10-12 21:11 ` David Miller
2013-10-14 5:52 ` Aida Mynzhasova [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=525B868D.9080806@skitlab.ru \
--to=aida.mynzhasova@skitlab$(echo .)ru \
--cc=davem@davemloft$(echo .)net \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=greg@kroah$(echo .)com \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox