At Thu, 25 Jun 2009 13:49:19 +0100, Mark Brown wrote:
On Thu, Jun 25, 2009 at 02:16:20PM +0200, Takashi Iwai wrote:
upstream is merged into ASoC, the whole upstream commits are shown first, then following ASoC commits. When ASoC is merged into an upstream, then the result becomes reversed. So, it's clear that the merge started from that upstream point.
Meh, OK.
It'd help me in future if you could either give some warning of the upstream merges or do them only immediately after pulling. The issue here from my point of view is that you've already merged up 2.6.31 into your branch and I routinely pull in changes on the topic branch for obvious reasons. I have this process semi-automated (and want to get it more so) so some warning would help.
Ah yes. I should have warned you that I forwarded my branch beforehand... Sorry for inconvenience.
Takashi