Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752805Ab0LUTTS (ORCPT ); Tue, 21 Dec 2010 14:19:18 -0500 Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:49296 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751863Ab0LUTTP (ORCPT ); Tue, 21 Dec 2010 14:19:15 -0500 Message-ID: <4D10FDAD.2060801@kernel.dk> Date: Tue, 21 Dec 2010 20:19:09 +0100 From: Jens Axboe MIME-Version: 1.0 To: James Bottomley CC: Tejun Heo , Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alan Stern , Kay Sievers , linux-scsi Subject: Re: [PATCH scsi-misc-2.6] sd: implement sd_check_events() References: <20101217122831.39300d94.sfr@canb.auug.org.au> <1292597607.2820.17.camel@mulgrave.site> <4D0CF27F.1080601@kernel.org> <1292862013.3034.7.camel@mulgrave.site> <1292954953.3034.15.camel@mulgrave.site> In-Reply-To: <1292954953.3034.15.camel@mulgrave.site> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1679 Lines: 45 On 2010-12-21 19:09, James Bottomley wrote: > On Mon, 2010-12-20 at 10:20 -0600, James Bottomley wrote: >> Added cc: linux-scsi >> >> On Sat, 2010-12-18 at 18:42 +0100, Tejun Heo wrote: >>> Replace sd_media_change() with sd_check_events(). >>> >>> * Move media removed logic into set_media_not_present() and >>> media_not_present() and set sdev->changed iff an existing media is >>> removed or the device indicates UNIT_ATTENTION. >>> >>> * Make sd_check_events() sets sdev->changed if previously missing >>> media becomes present. >>> >>> * Event is reported only if sdev->changed is set. >>> >>> This makes media presence event reported if scsi_disk->media_present >>> actually changed or the device indicated UNIT_ATTENTION. For backward >>> compatibility, SDEV_EVT_MEDIA_CHANGE is generated each time >>> sd_check_events() detects media change event. >>> >>> Signed-off-by: Tejun Heo >>> Cc: Kay Sievers >>> --- >>> Here it is. The conflicts were due to Alan's recent patch, which was >>> in the similar direction anyway. >> >> This looks fine to me. Jens can you strip the SCSI patches out of your >> tree and I'll run them through a postmerge tree to get the fix up? > > Ping on this, please: I can't build a postmerge tree until block is > sorted out. I need these four removing: I would need to revert those four then, I can't rebase any of those branches. -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/