---

yaml
---
r: 1969
b: refs/heads/master
c: 03722ad
h: refs/heads/master
i:
  1967: bd75302
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 386bfcf5e8a3c34d92156c945c8db58a1e2f7c69
+refs/heads/master: 03722adce90a248d0bea77d390decbd05991e2d2

trunk/arch/arm/mach-pxa/pxa25x.c

@@ -16,7 +16,6 @@
  * initialization stuff for PXA machines which can be overridden later if
  * need be.
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -104,7 +103,6 @@ unsigned int get_lcdclk_frequency_10khz(void)
 
 EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
 
-#ifdef CONFIG_PM
 
 int pxa_cpu_pm_prepare(suspend_state_t state)
 {
@@ -133,5 +131,3 @@ void pxa_cpu_pm_enter(suspend_state_t state)
 		break;
 	}
 }
-
-#endif

trunk/arch/arm/mach-pxa/pxa27x.c

@@ -120,8 +120,6 @@ EXPORT_SYMBOL(get_clk_frequency_khz);
 EXPORT_SYMBOL(get_memclk_frequency_10khz);
 EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
 
-#ifdef CONFIG_PM
-
 int pxa_cpu_pm_prepare(suspend_state_t state)
 {
 	switch (state) {
@@ -155,8 +153,6 @@ void pxa_cpu_pm_enter(suspend_state_t state)
 	}
 }
 
-#endif
-
 /*
  * device registration specific to PXA27x.
  */

trunk/drivers/usb/host/ehci-hub.c

@@ -439,12 +439,9 @@ static int ehci_hub_control (
 			/* force reset to complete */
 			writel (temp & ~PORT_RESET,
 					&ehci->regs->port_status [wIndex]);
-			/* REVISIT:  some hardware needs 550+ usec to clear
-			 * this bit; seems too long to spin routinely...
-			 */
 			retval = handshake (
 					&ehci->regs->port_status [wIndex],
-					PORT_RESET, 0, 750);
+					PORT_RESET, 0, 500);
 			if (retval != 0) {
 				ehci_err (ehci, "port %d reset error %d\n",
 					wIndex + 1, retval);

trunk/fs/nfs/file.c

@@ -37,7 +37,6 @@
 
 static int nfs_file_open(struct inode *, struct file *);
 static int nfs_file_release(struct inode *, struct file *);
-static loff_t nfs_file_llseek(struct file *file, loff_t offset, int origin);
 static int  nfs_file_mmap(struct file *, struct vm_area_struct *);
 static ssize_t nfs_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);
 static ssize_t nfs_file_read(struct kiocb *, char __user *, size_t, loff_t);
@@ -49,7 +48,7 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl);
 static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl);
 
 struct file_operations nfs_file_operations = {
-	.llseek		= nfs_file_llseek,
+	.llseek		= remote_llseek,
 	.read		= do_sync_read,
 	.write		= do_sync_write,
 	.aio_read		= nfs_file_read,
@@ -115,45 +114,6 @@ nfs_file_release(struct inode *inode, struct file *filp)
 	return NFS_PROTO(inode)->file_release(inode, filp);
 }
 
-/**
- * nfs_revalidate_size - Revalidate the file size
- * @inode - pointer to inode struct
- * @file - pointer to struct file
- *
- * Revalidates the file length. This is basically a wrapper around
- * nfs_revalidate_inode() that takes into account the fact that we may
- * have cached writes (in which case we don't care about the server's
- * idea of what the file length is), or O_DIRECT (in which case we
- * shouldn't trust the cache).
- */
-static int nfs_revalidate_file_size(struct inode *inode, struct file *filp)
-{
-	struct nfs_server *server = NFS_SERVER(inode);
-	struct nfs_inode *nfsi = NFS_I(inode);
-
-	if (server->flags & NFS_MOUNT_NOAC)
-		goto force_reval;
-	if (filp->f_flags & O_DIRECT)
-		goto force_reval;
-	if (nfsi->npages != 0)
-		return 0;
-	return nfs_revalidate_inode(server, inode);
-force_reval:
-	return __nfs_revalidate_inode(server, inode);
-}
-
-static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)
-{
-	/* origin == SEEK_END => we must revalidate the cached file length */
-	if (origin == 2) {
-		struct inode *inode = filp->f_mapping->host;
-		int retval = nfs_revalidate_file_size(inode, filp);
-		if (retval < 0)
-			return (loff_t)retval;
-	}
-	return remote_llseek(filp, offset, origin);
-}
-
 /*
  * Flush all dirty pages, and check for write errors.
  *

trunk/include/linux/if_tr.h

@@ -19,6 +19,8 @@
 #ifndef _LINUX_IF_TR_H
 #define _LINUX_IF_TR_H
 
+#include <asm/byteorder.h>	/* For __be16 */
+
 /* IEEE 802.5 Token-Ring magic constants.  The frame sizes omit the preamble
    and FCS/CRC (frame check sequence). */
 #define TR_ALEN		6		/* Octets in one token-ring addr */