Re: linux-next conflict resolution branch for btrfs

[Stephen Rothwell]

Hi Chris,

On Thu, 20 Aug 2015 13:39:18 -0400 Chris Mason <clm@xxxxxx> wrote:
>
> There are a few conflicts for btrfs in linux-next this time.  They are
> small, but I pushed out the merge commit I'm using here:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next-merge

Thanks for that.  It seems to have merged OK but maybe it conflicts
with something later in linux-next.  Unfortunately see my other email
about a build problem.  I will keep this example merge in mind for
later.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
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/