From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1034266AbdDUAvn (ORCPT ); Thu, 20 Apr 2017 20:51:43 -0400 Received: from ozlabs.org ([103.22.144.67]:59119 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1034273AbdDUAu4 (ORCPT ); Thu, 20 Apr 2017 20:50:56 -0400 Date: Fri, 21 Apr 2017 10:50:53 +1000 From: Stephen Rothwell To: "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , ARM Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Dave Gerlach , Santosh Shilimkar , Nishanth Menon , Keerthy Subject: linux-next: manual merge of the pm tree with the arm-soc tree Message-ID: <20170421105053.5df25205@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/soc/ti/ti_sci_pm_domains.c between commit: 52835d59fc6c ("soc: ti: Add ti_sci_pm_domains driver") from the arm-soc tree and commit: 112572283742 ("soc: ti: Add ti_sci_pm_domains driver") from the pm tree. I fixed it up (I used the pm tree version, but it was an arbitrary choice as the only difference is the URL in the Copyright line) 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. -- Cheers, Stephen Rothwell