linux-kernel - Re: [GIT PULL] ARM: Two more fixes for merge window fallout

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAOesGMhrokqQajQ6RROXdWNvVUd3WNjO4i3qggGAVXo5h05TKQ@mail.gmail.com>
Date:	Fri, 30 Mar 2012 18:18:40 -0700
From:	Olof Johansson <olof@...om.net>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
	arm@...nel.org
Subject: Re: [GIT PULL] ARM: Two more fixes for merge window fallout

On Fri, Mar 30, 2012 at 5:00 PM, Linus Torvalds
<torvalds@...ux-foundation.org> wrote:
> On Fri, Mar 30, 2012 at 4:20 PM, Olof Johansson <olof@...om.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/