linux-kernel - linux-next: manual merge of the akpm tree with the block 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]

Date:	Mon, 14 Jan 2013 14:58:16 +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,
	Asai Thambi S P <asamymuthupa@...ron.com>,
	Sam Bradshaw <sbradshaw@...ron.com>,
	Jens Axboe <axboe@...nel.dk>,
	Kent Overstreet <koverstreet@...gle.com>
Subject: linux-next: manual merge of the akpm tree with the block tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/block/mtip32xx/mtip32xx.c between commit 16c906e51c6f ("mtip32xx:
Add workqueue and NUMA support") from the  tree and commit "mtip32xx:
convert to batch completion" from the akpm tree.

I couldn't see how to fix up the conflicts, so I just dropped the akpm
tree patch.

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

Content of type "application/pgp-signature" skipped