From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755767Ab2AECeP (ORCPT ); Wed, 4 Jan 2012 21:34:15 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:10021 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752753Ab2AECeN (ORCPT ); Wed, 4 Jan 2012 21:34:13 -0500 X-AuditID: cbfee61b-b7b95ae00000198b-40-4f050c23ab75 From: Kukjin Kim To: "'Stephen Rothwell'" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "'Russell King'" References: <20120105120945.255c1f33be31363233d5a195@canb.auug.org.au> In-reply-to: <20120105120945.255c1f33be31363233d5a195@canb.auug.org.au> Subject: RE: linux-next: manual merge of the s5p tree with the arm tree Date: Thu, 05 Jan 2012 11:34:11 +0900 Message-id: <00f801cccb52$8234ffd0$869eff70$%kim@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: AczLRrwM1dNfFUkZRpaIhWkjj13t9wAC4npA Content-language: ko X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell wrote: > > Hi Kukjin, > > Today's linux-next merge of the s5p tree got a lot of conflicts caused by > duplicates of commits in your tree and Russell's. It looks like you have > merged a version of Russell's tree and then it has been rebased and added > to. You need to fix up your tree with respect to Russell's. > Oops, yeah. I will remove Russell's old tree in my next and sorry for bothering. Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.