From: James Bottomley <James.Bottomley@suse•de>
To: Jens Axboe <axboe@kernel•dk>
Cc: Tejun Heo <tj@kernel•org>,
Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alan Stern <stern@rowland•harvard.edu>,
Kay Sievers <kay.sievers@vrfy•org>,
linux-scsi <linux-scsi@vger•kernel.org>
Subject: Re: [PATCH scsi-misc-2.6] sd: implement sd_check_events()
Date: Tue, 21 Dec 2010 14:24:57 -0600 [thread overview]
Message-ID: <1292963097.3034.21.camel@mulgrave.site> (raw)
In-Reply-To: <4D10FDAD.2060801@kernel.dk>
On Tue, 2010-12-21 at 20:19 +0100, Jens Axboe wrote:
> 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 <tj@kernel•org>
> >>> Cc: Kay Sievers <kay.sievers@vrfy•org>
> >>> ---
> >>> 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.
That's a bit unfortunate. OK, just revert the sd one then. Hopefully
we're close enough to the merge window that we won't pick up conflicts
in the others.
James
next prev parent reply other threads:[~2010-12-21 20:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-17 1:28 linux-next: manual merge of the block tree with the tree Stephen Rothwell
2010-12-17 14:53 ` James Bottomley
2010-12-18 7:15 ` Tejun Heo
2010-12-18 17:42 ` [PATCH scsi-misc-2.6] sd: implement sd_check_events() Tejun Heo
2010-12-20 16:20 ` James Bottomley
2010-12-21 18:09 ` James Bottomley
2010-12-21 19:19 ` Jens Axboe
2010-12-21 20:24 ` James Bottomley [this message]
2010-12-22 8:49 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1292963097.3034.21.camel@mulgrave.site \
--to=james.bottomley@suse$(echo .)de \
--cc=axboe@kernel$(echo .)dk \
--cc=kay.sievers@vrfy$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-scsi@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=stern@rowland$(echo .)harvard.edu \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox