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]

Date:	Mon, 11 Feb 2013 06:37:00 -0800
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Arnd Bergmann <arnd@...db.de>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Alexey Khoroshilov <khoroshilov@...ras.ru>,
	Jiri Slaby <jslaby@...e.cz>, Joe Perches <joe@...ches.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the tty tree

On Mon, Feb 11, 2013 at 04:37:14PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/char/pcmcia/synclink_cs.c between commits 2e124b4a390c ("TTY:
> switch tty_flip_buffer_push") and 9fe8074b82ed ("TTY: synclink: Convert + to
> | for bit operations") from the tty tree and commit 3d55399391c8 ("pcmcia: synclink_cs: cleanup checkpatch warnings") from the char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix looks good, 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/