Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1035665AbdDUFyC (ORCPT ); Fri, 21 Apr 2017 01:54:02 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:32978 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1035421AbdDUFx7 (ORCPT ); Fri, 21 Apr 2017 01:53:59 -0400 MIME-Version: 1.0 In-Reply-To: <20170421105405.6a690b35@canb.auug.org.au> References: <20170421105405.6a690b35@canb.auug.org.au> From: Arnd Bergmann Date: Fri, 21 Apr 2017 07:53:57 +0200 X-Google-Sender-Auth: s9G53qcqoYZcex6j9FAg0Nc0ejQ Message-ID: Subject: Re: linux-next: manual merge of the pm tree with the arm-soc tree To: Stephen Rothwell Cc: "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-Length: 948 Lines: 30 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? Arnd