---

yaml
---
r: 57867
b: refs/heads/master
c: 0a71a31
h: refs/heads/master
i:
  57865: 56b2a68
  57863: 1a40212
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a289bbe27785a5f47dc501fa2bc18edfec147117
+refs/heads/master: 0a71a312437d444e1a45317823fda8160df37ee4

trunk/MAINTAINERS

@@ -4022,11 +4022,11 @@ S:	Supported
 
 XFS FILESYSTEM
 P:	Silicon Graphics Inc
-P:	Tim Shimmin
+P:	Tim Shimmin, David Chatterton
 M:	xfs-masters@oss.sgi.com
 L:	xfs@oss.sgi.com
 W:	http://oss.sgi.com/projects/xfs
-T:	git git://oss.sgi.com:8090/xfs/xfs-2.6.git
+T:	git git://oss.sgi.com:8090/xfs/xfs-2.6
 S:	Supported
 
 XILINX UARTLITE SERIAL DRIVER

trunk/arch/s390/kernel/setup.c

@@ -300,6 +300,7 @@ static void __init setup_zfcpdump(unsigned int console_devno)
 	else
 		sprintf(str, "cio_ignore=all,!0.0.%04x",
 			ipl_info.data.fcp.dev_id.devno);
+	strcat(COMMAND_LINE, " ");
 	strcat(COMMAND_LINE, str);
 	console_loglevel = 2;
 }

trunk/fs/xfs/linux-2.6/xfs_lrw.c

@@ -159,7 +159,7 @@ xfs_iozero(
 		if (status)
 			goto unlock;
 
-		zero_user_page(page, offset, bytes, KM_USER0);
+		memclear_highpage_flush(page, offset, bytes);
 
 		status = mapping->a_ops->commit_write(NULL, page, offset,
 							offset + bytes);

trunk/sound/ppc/pmac.c

@@ -775,8 +775,7 @@ static int snd_pmac_free(struct snd_pmac *chip)
 		out_le32(&chip->awacs->control, in_le32(&chip->awacs->control) & 0xfff);
 	}
 
-	if (chip->node)
-		snd_pmac_sound_feature(chip, 0);
+	snd_pmac_sound_feature(chip, 0);
 
 	/* clean up mixer if any */
 	if (chip->mixer_free)
@@ -926,7 +925,6 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
 	}
 	if (! sound) {
 		of_node_put(chip->node);
-		chip->node = NULL;
 		return -ENODEV;
 	}
 	prop = of_get_property(sound, "sub-frame", NULL);
@@ -939,9 +937,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
 		printk(KERN_INFO "snd-powermac no longer handles any "
 				 "machines with a layout-id property "
 				 "in the device-tree, use snd-aoa.\n");
-		of_node_put(sound);
 		of_node_put(chip->node);
-		chip->node = NULL;
 		return -ENODEV;
 	}
 	/* This should be verified on older screamers */
@@ -1301,6 +1297,8 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
 	return 0;
 
  __error:
+	if (chip->pdev)
+		pci_dev_put(chip->pdev);
 	snd_pmac_free(chip);
 	return err;
 }