From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kukjin Kim Subject: RE: linux-next: manual merge of the s5p tree with the arm tree Date: Mon, 18 Oct 2010 19:39:57 +0900 Message-ID: <048201cb6eb0$d0f2bea0$72d83be0$%kim@samsung.com> References: <20101018105046.368420c2.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7BIT Return-path: Received: from mailout4.samsung.com ([203.254.224.34]:36317 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753507Ab0JRKks (ORCPT ); Mon, 18 Oct 2010 06:40:48 -0400 In-reply-to: <20101018105046.368420c2.sfr@canb.auug.org.au> Content-language: ko Sender: linux-next-owner@vger.kernel.org List-ID: To: 'Stephen Rothwell' Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, 'Jeremy Kerr' , 'Lorenzo Pieralisi' , 'Jason Wang' , 'Tony Lindgren' , 'Russell King' Stephen wrote: > > Hi Kukjin, > Hi Stephen, > Today's linux-next merge of the s5p tree got a conflict in > arch/arm/mach-s5p6440/include/mach/debug-macro.S between commit > 08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and > virtual addresses from addruart") from the arm tree and commit > 29159b7dd244def6e0073ff0e2d4cbb59599187f ("ARM: S5P64X0: Add S5P64X0 > (S5P6440 and S5P6450) initialization support") from the s5p tree. > > The latter removed the file modified by the former. I did that. > > The appropriate part of the above arm commit needs to be done for the new > file arch/arm/mach-s5p64x0/include/mach/debug-macro.S . Unfortunately, I > am unqualified to do that ... I fixed it up and finished test on the board also..if any problems, please let me know. Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.