linux-kernel - linux-next: manual merge of the tty tree with the tile 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: <20130813154346.fb2e52f791fb6e2e3e2fbfcc@canb.auug.org.au>
Date:	Tue, 13 Aug 2013 15:43:46 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Chris Metcalf <cmetcalf@...era.com>,
	Srinivas Kandagatla <srinivas.kandagatla@...com>
Subject: linux-next: manual merge of the tty tree with the tile tree

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
include/uapi/linux/serial_core.h between commit 002abee2d681 ("tilegx:
Add tty serial support for TILE-Gx on-chip UART") from the tile tree and
commit c4b058560762 ("serial:st-asc: Add ST ASC driver") from the tty
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 b466487,e40ebe1..0000000
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -232,7 -232,7 +232,10 @@@
  /* SH-SCI */
  #define PORT_HSCIF	104
  
 +/* Tilera TILE-Gx UART */
 +#define PORT_TILEGX	105
 +
+ /* ST ASC type numbers */
 -#define PORT_ASC       105
++#define PORT_ASC       106
+ 
  #endif /* _UAPILINUX_SERIAL_CORE_H */

Content of type "application/pgp-signature" skipped