linux-kernel - linux-next: manual merge of the tty tree with the m68knommu 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: <20110210162914.eec2f4b5.sfr@canb.auug.org.au>
Date:	Thu, 10 Feb 2011 16:29:14 +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,
	Greg Ungerer <gerg@...inux.org>, Tejun Heo <tj@...nel.org>
Subject: linux-next: manual merge of the tty tree with the m68knommu tree

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/68328serial.c between commit
abf67e214f867d16df6a9c4ac7d8fc0b98ebad97 ("m68knommu: fix derefernce of
port.tty") from the m68knommu tree and commit
f094298bae5f5d0e1cb3bff4621aae7ef486812a ("68328serial: remove unsed
m68k_serial->tqueue_hangup") from the tty tree.

I just used the latter since it removed some of the code modified by the
former.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped