linux-kernel - Re: 2.6.19 -mm merge plans

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] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 22 Sep 2006 13:08:37 -0700
From:	Roland Dreier <rdreier@...co.com>
To:	Linus Torvalds <torvalds@...l.org>
Cc:	Dave Jones <davej@...hat.com>, David Miller <davem@...emloft.net>,
	jeff@...zik.org, davidsen@....com, alan@...rguk.ukuu.org.uk,
	linux-kernel@...r.kernel.org
Subject: Re: 2.6.19 -mm merge plans

    Linus>   And then at some point (probably later today) I decide to
    Linus> go into "merge mode" and go back to old mails I ignored and
    Linus> start applying them and pulling from other peoples git
    Linus> trees. And so if my "mode switching" has a longer latency
    Linus> than the "please pull" frequency, I end up seeing two
    Linus> requests for the same tree during the same "merge mode"
    Linus> thing, which just means that when I look at the older one,
    Linus> it no longer matches what is in the tree I'm pulling from.

My way of handling this has been to wait until you've acted on my
first merge request before sending another one.  I also don't touch my
published "for-linus" branch in git until you've pulled it.  I just
batch up pending changes in my "for-2.6.19" branch until my next merge
(and I also encourage people interested in Infiniband to run my
for-2.6.19 branch)

If I do see you merging other trees (in "merge mode") and skipping my
merge requests, I'll send a gentle reminder of my first merge request.

 - R.
-
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/