Re: linux-next: manual merge of the uuid tree with the arm64 tree

From	Will Deacon <will.deacon@arm.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the uuid tree with the arm64 tree
Date	2017-06-20 10:50 +0200
Message-ID	<tUn1g-6h1-17@gated-at.bofh.it> (permalink)
References	<tSRZv-4da-1@gated-at.bofh.it> <tU10K-Jx-15@gated-at.bofh.it> <tU1N7-1gP-1@gated-at.bofh.it> <tU26u-1nN-41@gated-at.bofh.it> <tU9Un-6lI-73@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Mon, Jun 19, 2017 at 12:41:38PM -0600, Baicar, Tyler wrote:
> On 6/19/2017 4:22 AM, Will Deacon wrote:
> >On Mon, Jun 19, 2017 at 01:06:30PM +0300, Andy Shevchenko wrote:
> >>On Mon, 2017-06-19 at 10:19 +0100, Will Deacon wrote:
> >>>Hi Stephen, Christoph, Tyler,
> >>>On Fri, Jun 16, 2017 at 03:21:36PM +1000, Stephen Rothwell wrote:
> >>>Apologies for this: I've just dropped the offending merge from the
> >>>arm64
> >>>tree so you can include the uuid tree in -next again.
> >>>
> >>>Tyler: please rebase your patches on top of Christoph's uuid-types
> >>>branch
> >>>and send me a new series.
> >>To have better coordination, please, look at my WIP branch regarding
> >>UUID stuff:
> >>http://bitbucket.org/andy-shev/linux/branch/topic%2Fuuid
> >That link doesn't work for me. Is there anything specific Tyler should be
> >paying attention to on that branch?
> That link doesn't work for me either, but I assume it is the topic/uuid
> branch here:
> 
> https://bitbucket.org/andy-shev/linux/branches/
> 
> I'll rebase my patches on top of this branch and send them to you Will.

The conflict in -next came from Christoph's tree:

  http://git.infradead.org/users/hch/uuid.git/heads

hence why I mentioned the uuid-types branch above. It's not clear to me
how Andy's branch fits in with this.

Will

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

Thread

linux-next: manual merge of the uuid tree with the arm64 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-16 07:30 +0200
  Re: linux-next: manual merge of the uuid tree with the arm64 tree Christoph Hellwig <hch@lst.de> - 2017-06-16 08:10 +0200
    Re: linux-next: manual merge of the uuid tree with the arm64 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-19 02:30 +0200
  Re: linux-next: manual merge of the uuid tree with the arm64 tree Will Deacon <will.deacon@arm.com> - 2017-06-19 11:20 +0200
    Re: linux-next: manual merge of the uuid tree with the arm64 tree Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-06-19 12:10 +0200
      Re: linux-next: manual merge of the uuid tree with the arm64 tree Will Deacon <will.deacon@arm.com> - 2017-06-19 12:30 +0200
        Re: linux-next: manual merge of the uuid tree with the arm64 tree "Baicar, Tyler" <tbaicar@codeaurora.org> - 2017-06-19 20:50 +0200
          Re: linux-next: manual merge of the uuid tree with the arm64 tree "Baicar, Tyler" <tbaicar@codeaurora.org> - 2017-06-19 21:30 +0200
          Re: linux-next: manual merge of the uuid tree with the arm64 tree Christoph Hellwig <hch@lst.de> - 2017-06-20 10:50 +0200
            Re: linux-next: manual merge of the uuid tree with the arm64 tree Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-06-20 11:00 +0200
              Re: linux-next: manual merge of the uuid tree with the arm64 tree "Baicar, Tyler" <tbaicar@codeaurora.org> - 2017-06-20 20:20 +0200
                Re: linux-next: manual merge of the uuid tree with the arm64 tree Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-06-20 20:20 +0200
                Re: linux-next: manual merge of the uuid tree with the arm64 tree Will Deacon <will.deacon@arm.com> - 2017-06-20 20:30 +0200
                Re: linux-next: manual merge of the uuid tree with the arm64 tree "Baicar, Tyler" <tbaicar@codeaurora.org> - 2017-06-20 20:30 +0200
                Re: linux-next: manual merge of the uuid tree with the arm64 tree Will Deacon <will.deacon@arm.com> - 2017-06-21 11:30 +0200
                Re: linux-next: manual merge of the uuid tree with the arm64 tree "Baicar, Tyler" <tbaicar@codeaurora.org> - 2017-06-21 20:20 +0200
          Re: linux-next: manual merge of the uuid tree with the arm64 tree Will Deacon <will.deacon@arm.com> - 2017-06-20 10:50 +0200

csiph-web