From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752776AbcD2BSr (ORCPT ); Thu, 28 Apr 2016 21:18:47 -0400 Received: from ozlabs.org ([103.22.144.67]:49567 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752159AbcD2BSp (ORCPT ); Thu, 28 Apr 2016 21:18:45 -0400 Date: Fri, 29 Apr 2016 11:18:43 +1000 From: Stephen Rothwell To: "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Petazzoni , Gregory CLEMENT , Viresh Kumar Subject: linux-next: manual merge of the pm tree with the arm-soc tree Message-ID: <20160429111843.456c713f@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: MAINTAINERS between commit: e269777f72b3 ("MAINTAINERS: attach arch/arm/configs/mvebu_*_defconfig to relevant maintainers") from the arm-soc tree and commit: 9f123def55d3 ("cpufreq: mvebu: Move cpufreq code into drivers/cpufreq/") from the pm tree. I fixed it up (see below) 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 diff --cc MAINTAINERS index e7ad57a3c1f5,0bb566e7df9b..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -1328,8 -1322,9 +1328,9 @@@ F: drivers/rtc/rtc-armada38x. F: arch/arm/boot/dts/armada* F: arch/arm/boot/dts/kirkwood* F: arch/arm64/boot/dts/marvell/armada* +F: arch/arm/configs/mvebu_*_defconfig + F: drivers/cpufreq/mvebu-cpufreq.c - ARM/Marvell Berlin SoC support M: Sebastian Hesselbarth L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)