Subject: Re: linux-next: manual merge of the target-updates tree with the tree

From: "Nicholas A. Bellinger" <[email-masked]>
Date: Mon, 01 Jun 2015 04:35:52 -0700

On Mon, 2015-06-01 at 21:22 +1000, Stephen Rothwell wrote:
> Hi Nicholas,
> 
> Today's linux-next merge of the target-updates tree got so many
> conflicts against Linus' tree that I just gave up and dropped it
> completely.  Please fix up this mess.
> 

Apologies for the conflicts vs. mainline in today's linux-next

The latest in target-pending/for-next from this morning should address
these conflicts vs. mainline.

Thank you,

--nab