From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751197Ab0G0Eeg (ORCPT ); Tue, 27 Jul 2010 00:34:36 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:54287 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750811Ab0G0Eef (ORCPT ); Tue, 27 Jul 2010 00:34:35 -0400 Date: Tue, 27 Jul 2010 14:34:30 +1000 From: Stephen Rothwell To: Greg KH Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Feng Tang , Guennadi Liakhovetski , Paul Mundt Subject: linux-next: manual merge of the tty tree with the genesis tree Message-Id: <20100727143430.05c018fc.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Greg, Today's linux-next merge of the tty tree got a conflict in include/linux/serial_core.h between commit 75b93489b449db4a34f0424c72f51821d985f52f ("serial: add a new port type, found on some sh-mobile SoCs") from the genesis tree and commit c3190cf68dfc58c33de0fd59b919cbb864acbba4 ("hsu: driver for Medfield High Speed UART device") from the tty tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc include/linux/serial_core.h index 5228320,f8fce35..0000000 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@@ -186,9 -186,12 +186,15 @@@ #define PORT_ALTERA_JTAGUART 91 #define PORT_ALTERA_UART 92 +/* SH-SCI */ +#define PORT_SCIFB 93 + + /* MAX3107 */ + #define PORT_MAX3107 94 + + /* High Speed UART for Medfield */ + #define PORT_MFD 95 + #ifdef __KERNEL__ #include