From: Stephen Rothwell <sfr@canb•auug.org.au>
To: mtk.manpages@gmail•com
Cc: linux-next@vger•kernel.org,
Linux Kernel <linux-kernel@vger•kernel.org>,
Andrey Vagin <avagin@openvz•org>
Subject: Re: linux-next: Tree for May 5
Date: Mon, 5 May 2014 20:26:28 +1000 [thread overview]
Message-ID: <20140505202628.7f406c1b77e05d0ad56db54c@canb.auug.org.au> (raw)
In-Reply-To: <CAKgNAkj4hsTBqfD72ZhoCrHdV4S_68tJEQ_AaE0KWO_cySqeHw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]
Hi Michael,
On Mon, 5 May 2014 12:06:27 +0200 "Michael Kerrisk (man-pages)" <mtk.manpages@gmail•com> 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.
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 :-)
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2014-05-05 10:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-05 7:14 linux-next: Tree for May 5 Stephen Rothwell
2014-05-05 8:42 ` Michael Kerrisk
2014-05-05 9:57 ` Stephen Rothwell
2014-05-05 10:06 ` Michael Kerrisk (man-pages)
2014-05-05 10:26 ` Stephen Rothwell [this message]
2014-05-05 10:45 ` Michael Kerrisk (man-pages)
-- strict thread matches above, loose matches on Subject: below --
2026-05-05 13:04 Thierry Reding
2025-05-05 8:41 Stephen Rothwell
2023-05-05 14:25 Mark Brown
2022-05-05 10:29 Stephen Rothwell
2021-05-05 2:42 Stephen Rothwell
2020-05-05 7:15 Stephen Rothwell
2020-05-05 9:06 ` Anders Roxell
2017-05-05 4:22 Stephen Rothwell
2016-05-05 6:06 Stephen Rothwell
2015-05-05 4:53 Stephen Rothwell
2011-05-05 3:49 Stephen Rothwell
2011-05-07 3:24 ` Jean-Christophe PLAGNIOL-VILLARD
2011-05-09 5:54 ` Stephen Rothwell
2010-05-05 2:34 Stephen Rothwell
2009-05-05 5:34 Stephen Rothwell
2009-05-05 9:49 ` Nico -telmich- Schottelius
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=20140505202628.7f406c1b77e05d0ad56db54c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=avagin@openvz$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mtk.manpages@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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