Re: "powerpc/83xx: gianfar_ptp: select 1588 clock source through dts file" was added twice

On 13.10.2013 01:11, David Miller wrote:

From: Aida Mynzhasova <redacted>
Date: Sat, 12 Oct 2013 18:54:42 +0400

quoted

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.