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

Message-Id: <20110922182625.4a18ee494a0f3bf977fc8ea3@canb.auug.org.au>
Date:	Thu, 22 Sep 2011 18:26:25 +1000
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,
	Christoph Hellwig <hch@...radead.org>,
	Eric Miao <eric.miao@...aro.org>
Subject: linux-next: manual merge of the akpm with the block tree

Hi Andrew,

Today's linux-next merge of the scsi-post-merge tree got a conflict in
drivers/block/brd.c between commit 5a7bbad27a41 ("block: remove support
for bio remapping from ->make_request") from the block tree and commit
4559c71773c5 ("brd_make_request() always returns 0, which doesn't make
much sense") from the akpm tree.

The former turns function brd_make_request() return void, so the latter
patch is no longer useful, so I dropped it.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped