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:
signature.asc
Description: This is a digitally signed message part.
