linux-kernel - linux-next: manual merge of the renesas tree with the tty tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130617171622.450bae1a5319f54004a18e2d@canb.auug.org.au>
Date:	Mon, 17 Jun 2013 17:16:22 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Simon Horman <horms@...ge.net.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jingchang Lu <b35083@...escale.com>, Greg KH <greg@...ah.com>,
	Ulrich Hecht <ulrich.hecht@...il.com>
Subject: linux-next: manual merge of the renesas tree with the tty tree

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
include/uapi/linux/serial_core.h between commit c9e2e946fb0b ("tty:
serial: add Freescale lpuart driver support") from the tty tree and
commit 24610a30600b ("serial: sh-sci: HSCIF support") from the renesas
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/uapi/linux/serial_core.h
index c8eaeb5,26eee07..0000000
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -226,7 -226,7 +226,10 @@@
  /* Rocketport EXPRESS/INFINITY */
  #define PORT_RP2	102
  
 +/* Freescale lpuart */
 +#define PORT_LPUART	103
 +
+ /* SH-SCI */
 -#define PORT_HSCIF	103
++#define PORT_HSCIF	104
+ 
  #endif /* _UAPILINUX_SERIAL_CORE_H */

Content of type "application/pgp-signature" skipped