From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759209AbZDGCFt (ORCPT ); Mon, 6 Apr 2009 22:05:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752106AbZDGCFj (ORCPT ); Mon, 6 Apr 2009 22:05:39 -0400 Received: from mx2.redhat.com ([66.187.237.31]:58822 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344AbZDGCFi (ORCPT ); Mon, 6 Apr 2009 22:05:38 -0400 Date: Mon, 6 Apr 2009 23:03:29 -0300 From: Mauro Carvalho Chehab To: Linus Torvalds Cc: Andrew Morton , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: Re: [GIT PATCHES for 2.6.30] V4L/DVB updates Message-ID: <20090406230329.5cf3d517@pedra.chehab.org> In-Reply-To: <20090406222940.02258999@pedra.chehab.org> References: <20090406215632.3eb96373@pedra.chehab.org> <20090406222940.02258999@pedra.chehab.org> Organization: Red Hat Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 6 Apr 2009 22:29:40 -0300 Mauro Carvalho Chehab wrote: > > On Mon, 6 Apr 2009 18:11:34 -0700 (PDT) > Linus Torvalds wrote: > > > > > > > On Mon, 6 Apr 2009, Mauro Carvalho Chehab wrote: > > > > > > Please pull from: > > > ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git for_linus > > > > Have you rebased your tree and pushed out multiple versions of it? > > > > I'm getting very confusing things from the mirrors, which are subtly > > different from the copy on master. > > > > This all looks like it was rebased just hours ago, and to top it off, it > > looks like you actually change stuff you had exported earlier. > > > > Don't do that. Really. It's very annoying. More than annoying, in fact. > > This had better simply not happen again! > > Yes, unfortunately I had to rebase. I noticed that one of the patches were > creating a file that didn't belong to that changeset, creating a file on the > wrong place (at -p2 diff format). > > We should be discussing during this kernel cycle about migrating our > development tree to use -git (instead of Mercurial). I hope that this will > avoid to detect such errors so late, and avoid a few conversion issues we > currently have. > > Sorry for the mess. In order to test, I did a fresh local clone of your tree and applied mine on the top of it. Everything worked as expected. Compilation also worked properly. I'll do my best to not rebase it anymore after exporting. Could you please pull from: ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git for_linus -- Cheers, Mauro