---

yaml
---
r: 88133
b: refs/heads/master
c: a4ba7fe
h: refs/heads/master
i:
  88131: db15cf3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1be62dc190ebaca331038962c873e7967de6cc4b
+refs/heads/master: a4ba7fe2a6c2b61419b290035bff398ab2591c54

trunk/drivers/ata/libata-core.c

@@ -2660,7 +2660,7 @@ int ata_bus_probe(struct ata_port *ap)
 	   specific sequence bass-ackwards so that PDIAG- is released by
 	   the slave device */
 
-	ata_link_for_each_dev(dev, &ap->link) {
+	ata_link_for_each_dev_reverse(dev, &ap->link) {
 		if (tries[dev->devno])
 			dev->class = classes[dev->devno];
 

trunk/drivers/parport/parport_pc.c

@@ -1568,8 +1568,9 @@ static void __devinit detect_and_report_it87(void)
 		outb(r | 8, 0x2F);
 		outb(0x02, 0x2E);	/* Lock */
 		outb(0x02, 0x2F);
+
+		release_region(0x2e, 1);
 	}
-	release_region(0x2e, 1);
 }
 #endif /* CONFIG_PARPORT_PC_SUPERIO */
 

trunk/fs/buffer.c

@@ -1181,20 +1181,7 @@ __getblk_slow(struct block_device *bdev, sector_t block, int size)
 void mark_buffer_dirty(struct buffer_head *bh)
 {
 	WARN_ON_ONCE(!buffer_uptodate(bh));
-
-	/*
-	 * Very *carefully* optimize the it-is-already-dirty case.
-	 *
-	 * Don't let the final "is it dirty" escape to before we
-	 * perhaps modified the buffer.
-	 */
-	if (buffer_dirty(bh)) {
-		smp_mb();
-		if (buffer_dirty(bh))
-			return;
-	}
-
-	if (!test_set_buffer_dirty(bh))
+	if (!buffer_dirty(bh) && !test_set_buffer_dirty(bh))
 		__set_page_dirty(bh->b_page, page_mapping(bh->b_page), 0);
 }