Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1042674AbdDUVuf (ORCPT ); Fri, 21 Apr 2017 17:50:35 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:28442 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1042472AbdDUVud (ORCPT ); Fri, 21 Apr 2017 17:50:33 -0400 Subject: Re: linux-next: manual merge of the pm tree with the arm-soc tree To: "Rafael J. Wysocki" References: <20170421105405.6a690b35@canb.auug.org.au> <1721375.qoxY63CZOC@aspire.rjw.lan> Cc: Arnd Bergmann , Stephen Rothwell , Olof Johansson , ARM , Linux-Next Mailing List , Linux Kernel Mailing List , Dave Gerlach , Santosh Shilimkar , Nishanth Menon From: Santosh Shilimkar Organization: Oracle Corporation Message-ID: <87963aff-148c-bbf5-9116-d2614f6991f4@oracle.com> Date: Fri, 21 Apr 2017 14:50:12 -0700 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <1721375.qoxY63CZOC@aspire.rjw.lan> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 601 Lines: 25 On 4/21/2017 2:31 PM, Rafael J. Wysocki wrote: > On Friday, April 21, 2017 02:02:35 PM santosh.shilimkar@oracle.com wrote: >> >> On 4/21/17 2:31 AM, Arnd Bergmann wrote: >>> On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilimkar@oracle.com [...] >>> 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