linux-kernel - Re: [GIT PATCHES for 2.6.30] V4L/DVB updates

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: <20090406230329.5cf3d517@pedra.chehab.org>
Date:	Mon, 6 Apr 2009 23:03:29 -0300
From:	Mauro Carvalho Chehab <mchehab@...hat.com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-kernel@...r.kernel.org, linux-media@...r.kernel.org
Subject: Re: [GIT PATCHES for 2.6.30] V4L/DVB updates


On Mon, 6 Apr 2009 22:29:40 -0300
Mauro Carvalho Chehab <mchehab@...hat.com> wrote:

> 
> On Mon, 6 Apr 2009 18:11:34 -0700 (PDT)
> Linus Torvalds <torvalds@...ux-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
--
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/