netdev - Re: [GIT] Networking

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]

Message-ID: <20110311063649.GA13293@elte.hu>
Date:	Fri, 11 Mar 2011 07:36:49 +0100
From:	Ingo Molnar <mingo@...e.hu>
To:	Steven Rostedt <rostedt@...dmis.org>
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>,
	David Miller <davem@...emloft.net>, akpm@...ux-foundation.org,
	netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT] Networking


* Steven Rostedt <rostedt@...dmis.org> wrote:

> On Thu, Mar 10, 2011 at 04:51:34PM -0800, Linus Torvalds wrote:
> > 
> > The reasons can be any of:
> > 
> >  - "I don't want to get too far away from upstream". This is very
> > understandable, but I have asked people to please _not_ merge "random
> > trees of the day". Please use major releases for this (or, if worst
> > comes to worst, -rc releases) rather than just do something else.
> 
> What are you throughts on starting work from a tree. Most of my work is usually 
> based off of some branch in tip, but sometimes when I'm pulling in patches that 
> are not really related to anything, I just simply grab whatever the latest Linus 
> branch is and start from there.
> 
> Is it preferable to instead start from one of the official releases?

Yes, for clarity of merge history i'm generally asking all people who send pull 
requests to -tip to use official -rc's as bases (or -tip branches), *not* some 
random daily -git snapshot. If a -git snapshot has to be merged for a good reason 
then please amend the merge commit with the Merge-Reason tag describing the good 
reason you had.

Thanks,

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html