Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753425Ab3H0Nxj (ORCPT ); Tue, 27 Aug 2013 09:53:39 -0400 Received: from www.linutronix.de ([62.245.132.108]:37177 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753062Ab3H0Nxh (ORCPT ); Tue, 27 Aug 2013 09:53:37 -0400 Message-ID: <521CAF59.1090203@linutronix.de> Date: Tue, 27 Aug 2013 15:53:29 +0200 From: Sebastian Andrzej Siewior User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130630 Icedove/17.0.7 MIME-Version: 1.0 To: Benoit Cousson CC: Javier Martinez Canillas , Stephen Rothwell , Greg KH , Arnd Bergmann , linux-kernel@vger.kernel.org, Felipe Balbi , linux-next@vger.kernel.org, Olof Johansson , linux-arm-kernel@lists.infradead.org Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree References: <20130827181353.319c150858829df1bb68d60b@canb.auug.org.au> <521C6961.9020103@linutronix.de> <521CA888.1080909@baylibre.com> In-Reply-To: <521CA888.1080909@baylibre.com> X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1076 Lines: 32 On 08/27/2013 03:24 PM, Benoit Cousson wrote: > Hi Sebatian, Hi Benoit, > Yes. DT patches are an endless source of merge conflicts if they are > merge throught different trees. Usually there are small conflicts because two people added / changed a node nearby. This patch turned the .dts file almost upside down. > What was discussed with Olof and Arnd during Connect is that we should > avoid merging DT patches outside arm-soc tree to avoid that kind of > situation. I am aware of this now. However these changes belonged together because a) they belonged together and b) would break the driver until the .dts changes and driver code is in-sync. In future I am going to ask you for a topic branch so I can get my changes in one piece without breaking stuff in the middle. What do we do now? > Regards, > Benoit Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/