From patchwork Sat Jun 4 18:19:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 849292 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p54IJs9m002727 for ; Sat, 4 Jun 2011 18:19:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754192Ab1FDSTq (ORCPT ); Sat, 4 Jun 2011 14:19:46 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:32822 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753809Ab1FDSTp (ORCPT ); Sat, 4 Jun 2011 14:19:45 -0400 Received: by iwn34 with SMTP id 34so2163081iwn.19 for ; Sat, 04 Jun 2011 11:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:message-id:date:from:user-agent :mime-version:to:subject:content-type:content-transfer-encoding; bh=hutRnpDZcEJmkcjfTy4wsP7wD1VFbCqrAfhKr/rDLC0=; b=mHHcn7wLvY+p2kqsH/FgXjq6YUFwWuz3aqT8D9m2R/fF6gORKFoG+qXWJRMaB08rPU KZazY7ULgUvNpTcEKAcIN0RaXf7I2HKi/A7GKqDmT29F76+0Cgf7133D4m8h8C1Mpp/i Id1Wo9zcfVRhP2Bmo0ER6I4DeATgZEc0bXEwc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; b=bqWjZ2hYk7LFcesc/guE2dWAUc5AnhMX7Oe7OBEWGviwSysYxD++K/NR9De9VvOA11 H2/TXRFGoDGl8Fntq58waF5xH1KUEf0FxA4dOz4AS6uCtI5mfcTUnk+jISMMQWbnBmyR dIwuC3JUTVQH4R27VyapNTONrZ3tuZn6o1CpM= Received: by 10.231.28.138 with SMTP id m10mr5112398ibc.39.1307211584409; Sat, 04 Jun 2011 11:19:44 -0700 (PDT) Received: from larrylap.lan (cpe-65-28-92-85.kc.res.rr.com [65.28.92.85]) by mx.google.com with ESMTPS id d10sm936243ibb.49.2011.06.04.11.19.42 (version=SSLv3 cipher=OTHER); Sat, 04 Jun 2011 11:19:43 -0700 (PDT) Message-ID: <4DEA773D.5070500@lwfinger.net> Date: Sat, 04 Jun 2011 13:19:41 -0500 From: Larry Finger User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110414 SUSE/3.1.10 Thunderbird/3.1.10 MIME-Version: 1.0 To: wireless , John Linville Subject: In case 3.0-rc1 from wireless-testing fails to boot Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 04 Jun 2011 18:19:55 +0000 (UTC) When I tried using 3.0-rc1 from mainline, my computer failed to boot because it got into an infinite loop initiated from user space. Bisection led to a particular commit, and reverting it "fixed" the problem. In fact, the actual problem was a faulty merge. This problem is fixed in the current linux-2.6-git, but that patch is not yet in wireless-testing. In case you run into this problem, the fix is commit 0f48f2600911d (reproduced below): commit 0f48f2600911d5de6393829e4a9986d4075558b3 Author: Linus Torvalds Date: Thu Jun 2 05:29:19 2011 +0900 block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal Jens' back-merge commit 698567f3fa79 ("Merge commit 'v2.6.39' into for-2.6.40/core") was incorrectly done, and re-introduced the DISK_EVENT_MEDIA_CHANGE lines that had been removed earlier in commits - 9fd097b14918 ("block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers") - 7eec77a1816a ("ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cd") because of conflicts with the "g->flags" updates near-by by commit d4dc210f69bc ("block: don't block events on excl write for non-optical devices") As a result, we re-introduced the hanging behavior due to infinite disk media change reports. Tssk, tssk, people! Don't do back-merges at all, and *definitely* don't do them to hide merge conflicts from me - especially as I'm likely better at merging them than you are, since I do so many merges. Reported-by: Steven Rostedt Cc: Jens Axboe Signed-off-by: Linus Torvalds --- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c index a0aabd9..46b8136 100644 --- a/drivers/block/paride/pcd.c +++ b/drivers/block/paride/pcd.c @@ -321,7 +321,6 @@ static void pcd_init_units(void) strcpy(disk->disk_name, cd->name); /* umm... */ disk->fops = &pcd_bdops; disk->flags = GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE; - disk->events = DISK_EVENT_MEDIA_CHANGE; } } diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index ae15a4d..7878da8 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c @@ -627,7 +627,6 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id) gendisk->fops = &viocd_fops; gendisk->flags = GENHD_FL_CD | GENHD_FL_REMOVABLE | GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE; - gendisk->events = DISK_EVENT_MEDIA_CHANGE; set_capacity(gendisk, 0); gendisk->private_data = d; d->viocd_disk = gendisk; diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 6e5123b..144d272 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -1782,7 +1782,6 @@ static int ide_cd_probe(ide_drive_t *drive) ide_cd_read_toc(drive, &sense); g->fops = &idecd_ops; g->flags |= GENHD_FL_REMOVABLE | GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE; - g->events = DISK_EVENT_MEDIA_CHANGE; add_disk(g); return 0;