Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161890Ab3DEOOw (ORCPT ); Fri, 5 Apr 2013 10:14:52 -0400 Received: from mail-ee0-f54.google.com ([74.125.83.54]:47652 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161873Ab3DEOOt (ORCPT ); Fri, 5 Apr 2013 10:14:49 -0400 Message-ID: <515EDC55.7090609@monstr.eu> Date: Fri, 05 Apr 2013 16:14:45 +0200 From: Michal Simek Reply-To: monstr@monstr.eu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: Arnd Bergmann CC: Stephen Rothwell , Olof Johansson , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring Subject: Re: linux-next: manual merge of the arm-soc tree with the xilinx tree References: <20130405153335.baf29606a97b1bee415f3546@canb.auug.org.au> <201304051409.37708.arnd@arndb.de> <201304051532.46156.arnd@arndb.de> In-Reply-To: <201304051532.46156.arnd@arndb.de> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1618 Lines: 46 On 04/05/2013 03:32 PM, Arnd Bergmann wrote: > On Friday 05 April 2013, Michal Simek wrote: >>>> Interesting. I rebased my arm-next branch based on 3.9-rc5 >>>> with some Rob's + one Arnd patch from arm-soc - clksrc/cleanup branch. >>>> >>>> I will fix my arm-next branch. >>> >>> The for-next branch in arm-soc is not stable, you should never base >>> anything on it. If you depend on some stable branch, that is in arm-soc, >>> then use just that branch, not one of the next/* branches or for-next. >>> >> >> I haven't based on arm-soc for-next branch my arm-next branch. >> I just took all patches I need for zynq and done git rebase v3.5-rc5. >> Which caused that I have became commuter of that 4 patches >> and there is probably any conflict between your for-next branch and >> clksrc/cleanup >> which you have resolved in for-next branch. > > Ah, I see. That was actually my fault, I'm sorry for causing trouble > here and then accusing you instead. > >> And because of my rebase sha1 are different that's why Stephen >> had problem with it. >> I have changed my arm-next branch and will see on Monday if Stephen >> will report any problem or not. > > Ok, thanks! No worries. Thanks, Michal -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian -- 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/