Re: [GIT PULL] spi fixes for v3.15

From: Linus Torvalds
Date: Fri Apr 11 2014 - 16:42:09 EST


On Fri, Apr 11, 2014 at 3:56 AM, Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> Same issue as on the regulator pull request with the entire diffstat for
> the original pull request for this merge window has appeared - like I
> say I will try to fix the scripts as it's annoying and unclear.

Yeah, looking at this, the problem does seem to be that extraneous
merge. I'm not sure why you did that "Merge tag 'spi-v3.15' into
spi-linus" at all, but it basically acts as an indirect back-merge
giving you two different merge bases.

You seem to start your development by doing a merge of that tag that
you sent me. Why? Why not just start *at* the tag you sent me, not at
that extraneous merge of that tag and v3.14.

Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/