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>] [day] [month] [year] [list]

Message-Id: <20130115141018.5135198bda8b6c63f6b7d0ee@canb.auug.org.au>
Date:	Tue, 15 Jan 2013 14:10:18 +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,
	Tejun Heo <tj@...nel.org>, 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 fs/bio.c
between commit 3a366e614d08 ("block: add missing block_bio_complete()
tracepoint") from the block tree and commit "block, aio: batch completion
for bios/kiocbs" from the akpm tree.

I am not sure how to fix this up, so I just dropped the block tree
additions of "trace_block_bio_complete(bio, error);" to this file.

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

Content of type "application/pgp-signature" skipped