Re: Fwd: [PATCH 2/4] drivers/staging/vt6656/upc.h: Remove ttype.h

[Dan Carpenter <dan.carpenter@oracle.com>]

[-- Attachment #1: Type: text/plain, Size: 2024 bytes --]

On Fri, Nov 04, 2011 at 08:40:30AM -0300, Marcos Souza wrote:
> 2011/11/4, Dan Carpenter <dan.carpenter@oracle.com>:
> > This doesn't apply to my copy of linux-next.  But that could be my
> > fault.  I'm not at my normal network right now, and my copy of
> > linux-next is two weeks old on this computer.  All patches should be
> > written against linux-next.
> >
> > http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=summary
> >
> > If you already wrote it against the latest linux-next then ignore me
> > and keep up the good work etc.  :)
> Once, I cloned the linux-next tree. But after one day, my git pull
                                                            ^^^^^^^^
> gives a lot of errors(on that time I don't knew half that I know now
> about the kernel...).
> 

Don't do a git pull of linux-next.  A git pull is short for:
git fetch git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
git merge FETCH_HEAD

The way to use linux-next is first do a fetch then a checkout:
git fetch git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
git checkout FETCH_HEAD

Longer explanation:

Normally in version control the whole point is to keep the history,
but for linux-next we redo it every day.  So you can't merge today's
history with yesterdays history.  You just take whatever is in
linux-next for today.

So let's say you are Linus and you apply a patch that later on turns
out to be a mistake.  The only thing he can do is apply another
patch on top of the first patch to fix the problem.  Maintainer trees
are more flexible if they find a mistake then they just edit the git
history so it looks like that patch was never applied.  We rebuild
linux next from scratch using the maintainer trees every day and
everyone is happy.  But once the patch hit Linus's tree it's set in
stone and you can't edit the git history anymore.

It's because we edit the history in linux-next that your pull failed.

regards,
dan carpenter


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]