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

Message-ID: <20130117093958.GA10117@fourier.local.igalia.com>
Date:	Thu, 17 Jan 2013 10:40:36 +0100
From:	Samuel Iglesias Gonsalvez <siglesias@...lia.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jiri Slaby <jslaby@...e.cz>
Subject: Re: linux-next: manual merge of the char-misc tree with the tty tree

On Thu, Jan 17, 2013 at 01:54:20PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/ipack/devices/ipoctal.c between commit 2e124b4a390c ("TTY: switch
> tty_flip_buffer_push") from the tty tree and commits 7e5730d7c222
> ("ipack/devices/ipoctal: fix kernel bug when using pppd"),
> e7e664fd688a ("ipack/devices/ipoctal: protect the channel data processing
> with a spinlock") and b06073f963b7 ("ipack/devices/ipoctal: remove
> redundant tty_flip_buffer_push()") from the char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me.

Thanks!

Sam

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)