linux-kernel - Re: linux-next: manual merge of the block tree with Linus' 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: <1351691714.13356.31.camel@deadeye.wl.decadent.org.uk>
Date:	Wed, 31 Oct 2012 13:55:14 +0000
From:	Ben Hutchings <ben@...adent.org.uk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Jens Axboe <axboe@...nel.dk>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Jiri Kosina <jkosina@...e.cz>,
	Herton Ronaldo Krzesinski <herton.krzesinski@...onical.com>
Subject: Re: linux-next: manual merge of the block tree with Linus' tree

On Wed, 2012-10-31 at 13:04 +1100, Stephen Rothwell wrote:
> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in
> drivers/block/floppy.c between a set of common patches from Linus' tree
> and commit b33d002f4b6b ("genhd: Make put_disk() safe for disks that have
> not been registered") from the block tree.
> 
> I fixed it up (by using the block tree version) and can carry the fix as
> necessary (no action is required).

commit b33d002f4b6b ("genhd: Make put_disk() safe for disks that have
not been registered") was supposed to be dropped or reverted; I don't
why it's hanging around.

Ben.

-- 
Ben Hutchings
I'm always amazed by the number of people who take up solipsism because
they heard someone else explain it. - E*Borg on alt.fan.pratchett

Download attachment "signature.asc" of type "application/pgp-signature" (829 bytes)