* "powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file" was added twice
@ 2013-10-12 14:54 Aida Mynzhasova
2013-10-12 21:11 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Aida Mynzhasova @ 2013-10-12 14:54 UTC (permalink / raw)
To: linuxppc-dev; +Cc: devicetree, davem, Greg KH
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.
Thanks!
--
Regards,
Aida
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: "powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file" was added twice
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
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2013-10-12 21:11 UTC (permalink / raw)
To: aida.mynzhasova; +Cc: devicetree, linuxppc-dev, greg
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: "powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file" was added twice
2013-10-12 21:11 ` David Miller
@ 2013-10-14 5:52 ` Aida Mynzhasova
0 siblings, 0 replies; 3+ messages in thread
From: Aida Mynzhasova @ 2013-10-14 5:52 UTC (permalink / raw)
To: David Miller; +Cc: devicetree, linuxppc-dev, greg
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-14 5:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).