From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: [GIT PULL] omap fixes for 2.6.33-rc3 Date: Fri, 8 Jan 2010 10:19:31 -0800 (PST) Message-ID: References: <20100108180912.GC6831@atomide.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:59466 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752901Ab0AHSUD (ORCPT ); Fri, 8 Jan 2010 13:20:03 -0500 In-Reply-To: <20100108180912.GC6831@atomide.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Tony Lindgren Cc: linux@atomide.com, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org On Fri, 8 Jan 2010, Tony Lindgren wrote: > > Please pull omap fixes from: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus No. I don't know what the *** people have been doing in that tree, but it looks like the _same_ branch was merged twice after rebasing: Merge branch 'for_2_6_33_rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-2.6.33-rc3 Merge branch 'for_2.6.33rc_b' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus This is why we don't rebase public trees, and I refuse to pull crap like that. You need to teach the people you work with to not rebase, and the only way I can say "stop" is by simply not pulling the crap. There are other problems with that branch too - the "committer" information is pure sh*t. It says "paul ", so quite frankly, somebody hasn't even read the very first chapter of just about every single git documentation that is out there. And now that I noticed, I see that the crap-for-brains committer info has been going on for a long time, and I just hadn't looked closely enough before. I didn't look closely enough to see if the rebase problem had also happened before. Linus From mboxrd@z Thu Jan 1 00:00:00 1970 From: torvalds@linux-foundation.org (Linus Torvalds) Date: Fri, 8 Jan 2010 10:19:31 -0800 (PST) Subject: [GIT PULL] omap fixes for 2.6.33-rc3 In-Reply-To: <20100108180912.GC6831@atomide.com> References: <20100108180912.GC6831@atomide.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, 8 Jan 2010, Tony Lindgren wrote: > > Please pull omap fixes from: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus No. I don't know what the *** people have been doing in that tree, but it looks like the _same_ branch was merged twice after rebasing: Merge branch 'for_2_6_33_rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-2.6.33-rc3 Merge branch 'for_2.6.33rc_b' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus This is why we don't rebase public trees, and I refuse to pull crap like that. You need to teach the people you work with to not rebase, and the only way I can say "stop" is by simply not pulling the crap. There are other problems with that branch too - the "committer" information is pure sh*t. It says "paul ", so quite frankly, somebody hasn't even read the very first chapter of just about every single git documentation that is out there. And now that I noticed, I see that the crap-for-brains committer info has been going on for a long time, and I just hadn't looked closely enough before. I didn't look closely enough to see if the rebase problem had also happened before. Linus