From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1037301AbdDUJbK (ORCPT ); Fri, 21 Apr 2017 05:31:10 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:33720 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S970509AbdDUJbE (ORCPT ); Fri, 21 Apr 2017 05:31:04 -0400 MIME-Version: 1.0 In-Reply-To: <4b58d5ab-c924-97af-728f-b9f524e62a53@oracle.com> References: <20170421105405.6a690b35@canb.auug.org.au> <4b58d5ab-c924-97af-728f-b9f524e62a53@oracle.com> From: Arnd Bergmann Date: Fri, 21 Apr 2017 11:31:03 +0200 X-Google-Sender-Auth: DZQboUtUMYwGprhDYbk1ZSI5OIg Message-ID: Subject: Re: linux-next: manual merge of the pm tree with the arm-soc tree To: "santosh.shilimkar@oracle.com" Cc: Stephen Rothwell , "Rafael J. Wysocki" , Olof Johansson , ARM , Linux-Next Mailing List , Linux Kernel Mailing List , Dave Gerlach , Santosh Shilimkar , Nishanth Menon Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id v3L9VEjo029440 On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilimkar@oracle.com wrote: > On 4/20/17 10:53 PM, Arnd Bergmann wrote: >> >> On Fri, Apr 21, 2017 at 2:54 AM, Stephen Rothwell >> wrote: >>> >>> Hi all, >>> >>> Today's linux-next merge of the pm tree got a conflict in: >>> >>> include/dt-bindings/genpd/k2g.h >>> >>> between commit: >>> >>> 7cc119f29b19 ("dt-bindings: Add TI SCI PM Domains") >>> >>> from the arm-soc tree and commit: >>> >>> 45da8edd1741 ("dt-bindings: Add TI SCI PM Domains") >>> >>> from the pm tree. >>> >>> I fixed it up (I just used the pm tree version) and can carry the fix as >>> necessary. This is now fixed as far as linux-next is concerned, but any >>> non trivial conflicts should be mentioned to your upstream maintainer >>> when your tree is submitted for merging. You may also want to consider >>> cooperating with the maintainer of the conflicting tree to minimise any >>> particularly complex conflicts. >> >> >> Dave, Santosh, >> >> any idea what happened here? It seems that we picked up the wrong >> version of the tree, do we need to drop this from arm-soc? >> > Nope. Its because this series was in my 'next' branch for a week or > so and now it made it via arm-soc tree next as well. > > I just cleaned up my next head so it linux-next next tag should have > only arm-soc copy. I still see two conflicting trees in linux-next as of today, neither of them is your keystone tree: arm-soc/next/drivers: ae3874cc931b ARM: keystone: Drop PM domain support for k2g 52835d59fc6c soc: ti: Add ti_sci_pm_domains driver 7cc119f29b19 dt-bindings: Add TI SCI PM Domains 213ec7fed302 PM / Domains: Do not check if simple providers have phandle cells a5ea7a0fcbd7 PM / Domains: Add generic data pointer to genpd data struct pm/pm-domains: 9da73c55f95f ARM: keystone: Drop PM domain support for k2g 112572283742 soc: ti: Add ti_sci_pm_domains driver 45da8edd1741 dt-bindings: Add TI SCI PM Domains b1013fa55589 PM / Domains: Do not check if simple providers have phandle cells 7030fc004df9 PM / Domains: Add generic data pointer to genpd data struct b539cc82d493 PM / Domains: Ignore domain-idle-states that are not compatible 075c37d59ecd PM / Domains: Don't warn about IRQ safe device for an always on PM domain 1c14967c6ea0 PM / Domains: Respect errors from genpd's ->power_off() callback ffaa42e8a40b PM / Domains: Enable users of genpd to specify always on PM domains 41e2c8e0060d PM / Domains: Clean up code validating genpd's status 8ce95844c853 PM / Domain: remove conditional from error case For all I can tell (and matching what Stephen found), the version in the 'pm' tree is the one you intended to send, while the version we merged into arm-soc has not only a different git commit ID but also some odd comments that are not present in the PM version: +/* + * TI SCI Generic Power Domain Driver + * + * Copyright (C) 2015-2017 Texas Instruments Incorporated - https://urldefense.proofpoint.com/v2/url?u=http-3A__www.ti.com_&d=DwIBAg&c=RoP1YumCXCgaWHvlZYR8PQcxBKCX5YTpkKY057SbK10&r=XBn1JQGPwR8CsE7xpP3wPlG6DQU7qw8ym65xieNZ4hY&m=R6qGiR9DbG1C3EF_0mL-m-qkmSO64GklbFWpUzqt8fY&s=YTWcQCWi5lnIf4XHDLq1XDd4JbZv9xpqOwdPD8xEdZE&e= Arnd