linux-kernel - linux-next: manual merge of the akpm 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>] [day] [month] [year] [list]

Message-Id: <20121126234227.b52fd36e85e561d50a44e2d9@canb.auug.org.au>
Date:	Mon, 26 Nov 2012 23:42:27 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alan Cox <alan@...ux.intel.com>, Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the akpm tree with the tty tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/tty/serial/serial_core.c between commit 7a876b39b5bc ("serial:
cast before shifting on port io") from the tty tree and commit
"drivers/tty/serial/serial_core.c: fix uart_get_attr_port() shift" from
the akpm tree.

I fixed it up (using the akpm tree version which included the fix from
the tty tree) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped