[GIT PULL] ARM: Two more fixes for merge window fallout

Olof Johansson olof at lixom.net
Fri Mar 30 21:18:40 EDT 2012


On Fri, Mar 30, 2012 at 5:00 PM, Linus Torvalds
<torvalds at linux-foundation.org> wrote:
> On Fri, Mar 30, 2012 at 4:20 PM, Olof Johansson <olof at lixom.net> wrote:
>>
>> are available in the git repository at:
>>
>>  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git fixes
>
> Hmm. I *think* you meant to ask me to pull the "fixes-for-linus" tag,
> which points at the same commit as the "fixes" branch. No?

Yes, that's correct.

> You might want to double-check whatever script or workflow you use to
> generate these pull requests.

Hmm, I had 'fixes' checked out locally, and used regular git request-pull.

Oh! I know what it was. I pushed the branch before I pushed the tag,
so when I generated the request the branch had propagated out from ra
to git.kernel.org but not the tag.

Since the branch matched but no tag did, request-pull used it and took
the local tag contents for the message so I didn't notice the
difference.

Thanks for the sanity check, I'll double-check in the future.


-Olof



More information about the linux-arm-kernel mailing list