Re: linux-next: manual merge of the pm tree with the arm-soc tree

From: Santosh Shilimkar
Date: Fri Apr 21 2017 - 17:50:56 EST




On 4/21/2017 2:31 PM, Rafael J. Wysocki wrote:
On Friday, April 21, 2017 02:02:35 PM santosh.shilimkar@xxxxxxxxxx wrote:

On 4/21/17 2:31 AM, Arnd Bergmann wrote:
On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilimkar@xxxxxxxxxx

[...]

I still see two conflicting trees in linux-next as of today, neither of
them is your keystone tree:

In the list it was agreed that the patchset goes via arm-soc tree.

OK, I missed that when I looked at it again a couple of days ago, sorry.

NP.

I'll drop it from the pm-domains branch.

Thanks for clarification.

Regards,
Santosh