From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org
Subject: Re: [GIT PATCHES for 2.6.30] V4L/DVB updates
Date: Mon, 6 Apr 2009 23:03:29 -0300 [thread overview]
Message-ID: <20090406230329.5cf3d517@pedra.chehab.org> (raw)
In-Reply-To: <20090406222940.02258999@pedra.chehab.org>
On Mon, 6 Apr 2009 22:29:40 -0300
Mauro Carvalho Chehab <mchehab@redhat.com> wrote:
>
> On Mon, 6 Apr 2009 18:11:34 -0700 (PDT)
> Linus Torvalds <torvalds@linux-foundation.org> 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
next prev parent reply other threads:[~2009-04-07 2:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-07 0:56 [GIT PATCHES for 2.6.30] V4L/DVB updates Mauro Carvalho Chehab
2009-04-07 1:11 ` Linus Torvalds
2009-04-07 1:29 ` Mauro Carvalho Chehab
2009-04-07 2:03 ` Mauro Carvalho Chehab [this message]
2009-04-08 7:56 ` [-rc1 build failure] cx231xx-audio.c:(.text+0xd4e43): undefined reference to `snd_card_free' (was: Re: [GIT PATCHES for 2.6.30] V4L/DVB updates) Ingo Molnar
2009-04-08 16:36 ` [-rc1 build failure] cx231xx-audio.c:(.text+0xd4e43): undefined reference to `snd_card_free' Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090406230329.5cf3d517@pedra.chehab.org \
--to=mchehab@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).