linux-kernel - linux-next: manual merge of the tty tree with the net-next 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>] [day] [month] [year] [list]

Message-Id: <20120309170201.93eec7e1108165c02ba2311c@canb.auug.org.au>
Date:	Fri, 9 Mar 2012 17:02:01 +1100
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,
	Joe Perches <joe@...ches.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Jiri Slaby <jslaby@...e.cz>
Subject: linux-next: manual merge of the tty tree with the net-next tree

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/isdn/gigaset/interface.c between commit 5bd49735db39 ("gigaset:
Use semicolons to terminate statements") from the net-next tree and
commit 2f16669d322e ("TTY: remove re-assignments to tty_driver members")
from the tty tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/isdn/gigaset/interface.c
index b826dac,8f8814a..0000000
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@@ -679,9 -593,8 +593,8 @@@ void gigaset_if_initdriver(struct gigas
  	if (tty == NULL)
  		goto enomem;
  
- 	tty->magic =		TTY_DRIVER_MAGIC;
 -	tty->type =		TTY_DRIVER_TYPE_SERIAL,
 -	tty->subtype =		SERIAL_TYPE_NORMAL,
 +	tty->type =		TTY_DRIVER_TYPE_SERIAL;
 +	tty->subtype =		SERIAL_TYPE_NORMAL;
  	tty->flags =		TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
  
  	tty->driver_name =	procname;

Content of type "application/pgp-signature" skipped