Skip to contentSkip to conversation

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

DISCUSSION Aida Mynzhasova 2 participants 3 messages Oct 12, 2013 – Oct 14, 2013 2 messages not in the archive

lore
Share & tools
lore
#0 lore raw

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!

Signature · 6 lines
Regards,
Aida
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

From: Aida Mynzhasova <[email protected]>
Date: Sat, 12 Oct 2013 18:54:42 +0400

Quoted 11 lines

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.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 20131012.171110.246440214474931440.davem-fT/PcQaiUtIeIZ0/[email protected]

#4 lore raw
Quoted 21 lines · David Miller

From: Aida Mynzhasova <[email protected]>
Date: Sat, 12 Oct 2013 18:54:42 +0400

Quoted 11 lines

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.

Quoted 6 lines

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.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html