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  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]
Date:	Mon, 10 Mar 2014 15:39:50 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Jens Axboe <axboe@...nel.dk>,
	Christoph Hellwig <hch@...radead.org>,
	Roman Pen <r.peniaev@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the block tree with Linus' tree

Hi Jens,

Today's linux-next merge of the block tree got a conflict in block/blk-mq.c between commit d6a25b31315327 (blk-mq: support partial I/O completions) from Linus' tree and commit af5040da01ef (blktrace: fix accounting of partially completed requests) from the block tree.

I fixed it up by dropping the hunk from af5040da01ef in a way git doesn't seem easily persuaded to show as a resolution and can carry the fix as necessary (no action is required).

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists