Re: linux-next: Tree for May 5

[Michael Kerrisk (man-pages)]

On Mon, May 5, 2014 at 12:26 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Michael,
>
> On Mon, 5 May 2014 12:06:27 +0200 "Michael Kerrisk (man-pages)" <mtk.manpages@xxxxxxxxx> wrote:
>>
>> Okay, must be my problem then. Sorry for the noise. Somehow, I'm not
>> syncing my linux-next correctly then. (Is the proper way of doing this
>> documented somewhere?)
>
> Yeah, in the stuff you quoted :-)

:-}
> "If you
> are tracking the linux-next tree using git, you should not use "git pull"
> to do so as that will try to merge the new linux-next release with the
> old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
> (see below)."
>
> then later
>
> "There is a wiki covering stuff to do with linux-next at
> http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel."
>
> Unfortunately, that site seems to have vanished :-(  Seems like I need to
> update my daily release note.

It was those instructions that I thought I'd been following (from
memory), and then when I went to google for the site I recalled
finding them on, I didn't get a match. Now I know why ;-).

> Since linux-next is rebased and remoerged every day, you need to "git
> fetch" the tree and then "git reset" to the new tree, not "git pull".
> The latter will try to merge the new linux-next into the previous one  -
> which should normally make a read mess :-)

Okay -- thanks.

Cheers,

Michael


-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Linux/UNIX System Programming Training: http://man7.org/training/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/