linux-kernel - linux-next: manual merge of the char-misc tree with the 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]

Date:	Thu, 27 Sep 2012 15:31:19 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alexey Khoroshilov <khoroshilov@...ras.ru>,
	Huang Shijie <shijie8@...il.com>
Subject: linux-next: manual merge of the char-misc tree with the  tree

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
drivers/char/pcmcia/synclink_cs.c between commit f21ec3d2d46e ("serial:
add a new helper function") from the tty tree and commit 221b7b5796b5
("pcmcia: synclink_cs: fix potential tty NULL dereference") from the
char-misc 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 drivers/char/pcmcia/synclink_cs.c
index 3f57d5de,a6b8dde..0000000
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@@ -1050,7 -1058,7 +1058,7 @@@ static void cts_change(MGSLPC_INFO *inf
  	wake_up_interruptible(&info->status_event_wait_q);
  	wake_up_interruptible(&info->event_wait_q);
  
- 	if (tty_port_cts_enabled(&info->port)) {
 -	if (tty && (info->port.flags & ASYNC_CTS_FLOW)) {
++	if (tty && tty_port_cts_enabled(&info->port)) {
  		if (tty->hw_stopped) {
  			if (info->serial_signals & SerialSignal_CTS) {
  				if (debug_level >= DEBUG_LEVEL_ISR)

Content of type "application/pgp-signature" skipped