From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Subject: Re: linux-next: manual merge of the renesas tree with the arm-soc tree Date: Sun, 5 Jan 2014 14:54:09 +0900 Message-ID: <20140105055407.GC5150@verge.net.au> References: <20131216104738.6f845aabd0e3b609ed9ca170@canb.auug.org.au> <52AECF56.8020508@atmel.com> <20140104224346.c0f1689a8c7c62d4ee22aa3b@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from kirsty.vergenet.net ([202.4.237.240]:52692 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750747AbaAEFyO (ORCPT ); Sun, 5 Jan 2014 00:54:14 -0500 Content-Disposition: inline In-Reply-To: <20140104224346.c0f1689a8c7c62d4ee22aa3b@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Olof Johansson , Nicolas Ferre , Arnd Bergmann , "linux-arm-kernel@lists.infradead.org" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Boris BREZILLON , Laurent Pinchart , Mike Turquette On Sat, Jan 04, 2014 at 10:43:46PM +1100, Stephen Rothwell wrote: > Hi Olof, > > On Fri, 3 Jan 2014 21:11:29 -0800 Olof Johansson wrote: > > > > Now I can't resolve it properly and move the entries when I do the > > same merge (and get the same conflict), because that will cause a > > third conflict for Stephen, and he's about to return from vacation and > > is going to cuss at us if we cause too many new conflicts in one day. > > :) > > Since I have now been made aware of the issue, you might as well just > sort it in the merge. And I have never been known to "cuss", though > ranting is a possibility :-) Rant accepted. I will be more careful in future. From mboxrd@z Thu Jan 1 00:00:00 1970 From: horms@verge.net.au (Simon Horman) Date: Sun, 5 Jan 2014 14:54:09 +0900 Subject: linux-next: manual merge of the renesas tree with the arm-soc tree In-Reply-To: <20140104224346.c0f1689a8c7c62d4ee22aa3b@canb.auug.org.au> References: <20131216104738.6f845aabd0e3b609ed9ca170@canb.auug.org.au> <52AECF56.8020508@atmel.com> <20140104224346.c0f1689a8c7c62d4ee22aa3b@canb.auug.org.au> Message-ID: <20140105055407.GC5150@verge.net.au> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Sat, Jan 04, 2014 at 10:43:46PM +1100, Stephen Rothwell wrote: > Hi Olof, > > On Fri, 3 Jan 2014 21:11:29 -0800 Olof Johansson wrote: > > > > Now I can't resolve it properly and move the entries when I do the > > same merge (and get the same conflict), because that will cause a > > third conflict for Stephen, and he's about to return from vacation and > > is going to cuss at us if we cause too many new conflicts in one day. > > :) > > Since I have now been made aware of the issue, you might as well just > sort it in the merge. And I have never been known to "cuss", though > ranting is a possibility :-) Rant accepted. I will be more careful in future.