From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751403Ab1GTKb1 (ORCPT ); Wed, 20 Jul 2011 06:31:27 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:25124 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751229Ab1GTKb0 (ORCPT ); Wed, 20 Jul 2011 06:31:26 -0400 X-AuditID: cbfee61a-b7cf0ae000006bc6-a0-4e26ae6d1af0 Date: Wed, 20 Jul 2011 19:30:03 +0900 From: Kukjin Kim Subject: RE: linux-next: manual merge of the s5p tree with the arm-soc tree In-reply-to: <20110720113536.72c28c19d623c5e7f8604ca2@canb.auug.org.au> To: "'Stephen Rothwell'" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "'Thomas Abraham'" , "'Nicolas Pitre'" , "'Arnd Bergmann'" , ben-linux@fluff.org Message-id: <064101cc46c8$240fcac0$6c2f6040$%kim@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Content-type: text/plain; charset=us-ascii Content-language: ko Content-transfer-encoding: 7BIT Thread-index: AcxGfVlNk7b4w4isS/CxWaSX6Dnf4wASS/tA References: <20110720113536.72c28c19d623c5e7f8604ca2@canb.auug.org.au> 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, > Hi :) > Today's linux-next merge of the s5p tree got conflicts in drivers/tty/serial/s3c2400.c > and drivers/tty/serial/s3c24a0.c between commits 632b7cf6c056 ("ARM: mach- > s3c2400: delete") and af0e060e24ce ("ARM: mach-s3c24a0: delete")from the arm- > soc tree and commit 470805f8f958 ("serial: Remove redundant console_initcall > from s3c and s5p console drivers") from the s5p tree. > > The former removes these files, so I did that. OK, you're right. As a note, I fixed my -next tree just now to avoid conflicts between arm-soc. Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.