Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1210814

Re: linux-next conflict resolution branch for btrfs

Show all headers | View raw

Hi Chris,

On Thu, 20 Aug 2015 13:39:18 -0400 Chris Mason <clm@fb.com> 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@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next conflict resolution branch for btrfs Chris Mason <clm@fb.com> - 2015-08-20 19:40 +0200
  Re: linux-next conflict resolution branch for btrfs Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-21 02:50 +0200
    Re: linux-next conflict resolution branch for btrfs Chris Mason <clm@fb.com> - 2015-08-21 17:30 +0200
    Re: linux-next conflict resolution branch for btrfs Chris Mason <clm@fb.com> - 2015-08-21 20:10 +0200

csiph-web