linux-kernel - Re: 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20110922133717.GA21575@infradead.org>
Date:	Thu, 22 Sep 2011 09:37:17 -0400
From:	Christoph Hellwig <hch@...radead.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@...radead.org>,
	Eric Miao <eric.miao@...aro.org>
Subject: Re: linux-next: manual merge of the akpm with the block tree

On Thu, Sep 22, 2011 at 06:26:25PM +1000, Stephen Rothwell wrote:
> 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.

Where did the latter patch come from?  Given that brd_make_request is
for the ramdisk driver that never does remapping returning anything but
zero would be a bug anyway.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/