From: Dave <dave@thekilempire.com>
To: linux-btrfs@vger.kernel.org
Subject: for-linus and linux 3.8.9
Date: Fri, 26 Apr 2013 17:00:01 -0400 [thread overview]
Message-ID: <19280726.yCn8YDygvD@zeppelin> (raw)
[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]
I've not been able to pull Chris's for-linus branch into a recent kernel for a
few weeks now (since 3.8.5). Is for-linus still compatible with the latest
stable releases? If not, what is the preferred way of running the latest
btrfs code?
$ git clone linux linux-3.8.10
$ cd linux-3.8.10
$ git checkout v3.8.10
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git
for-linus
>From git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
* branch for-linus -> FETCH_HEAD
Auto-merging include/uapi/linux/btrfs.h
Auto-merging fs/btrfs/volumes.c
Auto-merging fs/btrfs/tree-log.c
CONFLICT (content): Merge conflict in fs/btrfs/tree-log.c
Auto-merging fs/btrfs/scrub.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/btrfs/extent_io.h
Auto-merging fs/btrfs/extent_io.c
Auto-merging fs/btrfs/extent-tree.c
CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c
Auto-merging fs/btrfs/ctree.c
Automatic merge failed; fix conflicts and then commit the result.
--
-=[dave]=-
Entropy isn't what it used to be.
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 230 bytes --]
reply other threads:[~2013-04-26 21:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=19280726.yCn8YDygvD@zeppelin \
--to=dave@thekilempire.com \
--cc=linux-btrfs@vger.kernel.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