linux-kernel - Re: 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20110210185115.GB15944@kroah.com>
Date:	Thu, 10 Feb 2011 10:51:15 -0800
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Greg Ungerer <gerg@...inux.org>, Tejun Heo <tj@...nel.org>
Subject: Re: linux-next: manual merge of the tty tree with the m68knommu
 tree

On Thu, Feb 10, 2011 at 04:29:14PM +1100, Stephen Rothwell wrote:
> 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.

Sounds fine, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/