Re: linux-next: manual merge of the tip tree with Linus' tree

From	Mark Rutland <mark.rutland@arm.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the tip tree with Linus' tree
Date	2017-05-23 10:40 +0200
Message-ID	<tKdwf-Fm-43@gated-at.bofh.it> (permalink)
References	<tJMml-8wg-1@gated-at.bofh.it> <tJR2F-382-9@gated-at.bofh.it> <tK3nb-2zS-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Stephen,

On Tue, May 23, 2017 at 07:44:56AM +1000, Stephen Rothwell wrote:
> On Mon, 22 May 2017 09:32:15 +0100 Mark Rutland <mark.rutland@arm.com> wrote:
> >
> > Just to check, is your copy of tip up-to-date?
> 
> Yes, it was fetched just before being merged.  I use the auto-latest
> branch of the tip tree which may not be as up to date as the master
> branch.

Thanks for the pointer; there was a stale copy there, which has now been
zapped.

Hopefully we're conflict-free for next-20170524.

Thanks for the heads-up!

Mark.

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

Thread

linux-next: manual merge of the tip tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-05-22 05:40 +0200
  Re: linux-next: manual merge of the tip tree with Linus' tree Mark Rutland <mark.rutland@arm.com> - 2017-05-22 10:40 +0200
    Re: linux-next: manual merge of the tip tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-05-22 23:50 +0200
      Re: linux-next: manual merge of the tip tree with Linus' tree Mark Rutland <mark.rutland@arm.com> - 2017-05-23 10:40 +0200

csiph-web