linux-kernel - Re: linux-next: manual merge of the tip tree with the arm tree

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:	Mon, 16 May 2011 09:31:44 +0200
From:	Ingo Molnar <mingo@...e.hu>
To:	Russell King - ARM Linux <linux@....linux.org.uk>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Thomas Gleixner <tglx@...utronix.de>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	John Stultz <john.stultz@...aro.org>,
	Jacob Pan <jacob.jun.pan@...el.com>,
	Glauber Costa <glommer@...hat.com>,
	Dimitri Sivanich <sivanich@....com>,
	Rusty Russell <rusty@...tcorp.com.au>,
	Jeremy Fitzhardinge <jeremy@...source.com>,
	Chris McDermott <lcm@...ibm.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Subject: Re: linux-next: manual merge of the tip tree with the arm tree


* Russell King - ARM Linux <linux@....linux.org.uk> wrote:

> On Fri, May 13, 2011 at 11:26:46AM +0200, Ingo Molnar wrote:
> > Had you asked us before committing it one day after it was posted, or had you 
> > *noticed* that those files are not in your tree and are already modified in 
> > linux-next, you'd have gotten a response like:
> 
> Please also don't read anything into the commit date - it merely shows
> when the last update happened.
>
> My workflow for patch series involves keeping them in git right from the 
> start.  So actually they've been in git since _before_ they were posted. In 
> fact, the emails which I send out for any patch series are always generated 
> from the git commits.
> 
> So, all my patches live in git _first_ before being mailed out.

It is not a problem at all if you commit it to some non-permanent development 
branch of your own - we all do it.

The commit date i pointed out was of the *final* commit, which got into 
linux-next. That showed a timestamp of just a day after the patch was sent
out: presumably you rebased it to add John's Acked-by.

The step where your workflow failed was to take upon yourself to maintain a 
file you do not normally maintain *and* messing up doing that:

 - you did not ask the maintainers who maintain it (which is fine as long as 
   you do not mess up)

 - you did not realize that the file you modified is already modified in that
   tree, almost two months ago (it's not that hard to fetch linux-next once 
   every week or so)

 - you did not even notify them that you committed something so when the bug
   happened in linux-next they had no idea what was going on

Had you done any of those steps differently we'd have a better outcome.

It's not a big problem all and we can resolve it, but you need to stop 
pretending that your workflow was just fine - it sucked here.

Thanks,

	Ingo
--
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/