| 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
| ||
|
Date: Sat, 24 Mar 2012 11:43:31 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc: linux-kernel@...r.kernel.org, xen-devel@...ts.xensource.com
Subject: Re: [GIT PULL] (xen) stable/for-linus-3.4-tag-two (or three depending
on your taste) for v3.4-rc0
On Sat, Mar 24, 2012 at 6:56 AM, Konrad Rzeszutek Wilk
<konrad.wilk@...cle.com> wrote:
>
> So the problem is when I do the git pull against your latest, it doesn't apply the "provide .."
> but I still see it in the git shortlog!? Is that OK?
The fact that you see it in the shortlog just means that the commit is
there. If you don't see it in the diff, it is because somebody else
applied the *same* patch, but as a separate commit, so the merge will
have just considered it a no-op.
It's not uncommon, and if it happens occasionally with duplicated
patches that's fine. If it happens a *lot* that two people keep
applying the same patch to their different branches, that implies that
there's some workflow problem where people continually keep on
stepping on each others toes, and that's a problem.
But the occasional "oops, that change was already in mainline" is fine.
Linus
--
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/
Powered by blists - more mailing lists