From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751652Ab1GTKOJ (ORCPT ); Wed, 20 Jul 2011 06:14:09 -0400 Received: from trinity.fluff.org ([89.16.178.74]:59775 "EHLO trinity.fluff.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751289Ab1GTKOH (ORCPT ); Wed, 20 Jul 2011 06:14:07 -0400 Date: Wed, 20 Jul 2011 11:13:58 +0100 From: Ben Dooks To: Stephen Rothwell Cc: Kukjin Kim , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Abraham , Nicolas Pitre , Arnd Bergmann Subject: Re: linux-next: manual merge of the s5p tree with the arm-soc tree Message-ID: <20110720101358.GT21138@trinity.fluff.org> References: <20110720113536.72c28c19d623c5e7f8604ca2@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110720113536.72c28c19d623c5e7f8604ca2@canb.auug.org.au> X-Disclaimer: These are my views alone. X-URL: http://www.fluff.org/ User-Agent: Mutt/1.5.18 (2008-05-17) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: ben@trinity.fluff.org X-SA-Exim-Scanned: No (on trinity.fluff.org); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 20, 2011 at 11:35:36AM +1000, Stephen Rothwell wrote: > Hi Kukjin, > > 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. Yes, there's little chance of these socs ever being added, so nico removed all reference to them. -- Ben Dooks, ben@fluff.org, http://www.fluff.org/ben/ Large Hadron Colada: A large Pina Colada that makes the universe disappear.