diff --git a/[refs] b/[refs]
index 95b5e0b829b4..7a2e9802f0e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4195bdbea42151c04485b0d131eed6dd97309cee
+refs/heads/master: 177b2927e2eea73c598a218680b4dc9043c51dcb
diff --git a/trunk/arch/mips/mips-boards/malta/malta_setup.c b/trunk/arch/mips/mips-boards/malta/malta_setup.c
index ab460f805bef..282f3e52eea3 100644
--- a/trunk/arch/mips/mips-boards/malta/malta_setup.c
+++ b/trunk/arch/mips/mips-boards/malta/malta_setup.c
@@ -159,7 +159,7 @@ void __init plat_mem_setup(void)
 				BONITO_PCIMEMBASECFG |=
 					(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED |
 					 BONITO_PCIMEMBASECFG_MEMBASE1_CACHED);
-				printk("Disabled Bonito IOBC coherency\n");
+				printk("Enabled Bonito IOBC coherency\n");
 			}
 		}
 		else
diff --git a/trunk/arch/x86_64/kernel/early_printk.c b/trunk/arch/x86_64/kernel/early_printk.c
index 47b6d90349da..e22ecd54870d 100644
--- a/trunk/arch/x86_64/kernel/early_printk.c
+++ b/trunk/arch/x86_64/kernel/early_printk.c
@@ -224,7 +224,7 @@ static int __init setup_early_printk(char *buf)
 		return 0;
 	early_console_initialized = 1;
 
-	if (strstr(buf, "keep"))
+	if (!strcmp(buf,"keep"))
 		keep_early = 1;
 
 	if (!strncmp(buf, "serial", 6)) {
diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c
index 296159ec5189..7ea49a0d5ec3 100644
--- a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1087,7 +1087,7 @@ static int inval_cache_and_wait_for_operation(
 		}
 		spin_lock(chip->mutex);
 
-		while (chip->state != chip_state) {
+		if (chip->state != chip_state) {
 			/* Someone's suspended the operation: sleep */
 			DECLARE_WAITQUEUE(wait, current);
 			set_current_state(TASK_UNINTERRUPTIBLE);
diff --git a/trunk/fs/ecryptfs/crypto.c b/trunk/fs/ecryptfs/crypto.c
index f63a7755fe86..136175a69332 100644
--- a/trunk/fs/ecryptfs/crypto.c
+++ b/trunk/fs/ecryptfs/crypto.c
@@ -820,8 +820,7 @@ int ecryptfs_init_crypt_ctx(struct ecryptfs_crypt_stat *crypt_stat)
 	crypt_stat->tfm = crypto_alloc_blkcipher(full_alg_name, 0,
 						 CRYPTO_ALG_ASYNC);
 	kfree(full_alg_name);
-	if (IS_ERR(crypt_stat->tfm)) {
-		rc = PTR_ERR(crypt_stat->tfm);
+	if (!crypt_stat->tfm) {
 		ecryptfs_printk(KERN_ERR, "cryptfs: init_crypt_ctx(): "
 				"Error initializing cipher [%s]\n",
 				crypt_stat->cipher);
diff --git a/trunk/include/scsi/libsas.h b/trunk/include/scsi/libsas.h
index 1d77b63c5ea4..9582e8401669 100644
--- a/trunk/include/scsi/libsas.h
+++ b/trunk/include/scsi/libsas.h
@@ -35,7 +35,6 @@
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_transport_sas.h>
-#include <asm/scatterlist.h>
 
 struct block_device;
 
diff --git a/trunk/kernel/kmod.c b/trunk/kernel/kmod.c
index 2b76dee28496..bb4e29d924e4 100644
--- a/trunk/kernel/kmod.c
+++ b/trunk/kernel/kmod.c
@@ -307,14 +307,14 @@ int call_usermodehelper_pipe(char *path, char **argv, char **envp,
 		return 0;
 
 	f = create_write_pipe();
-	if (IS_ERR(f))
-		return PTR_ERR(f);
+	if (!f)
+		return -ENOMEM;
 	*filp = f;
 
 	f = create_read_pipe(f);
-	if (IS_ERR(f)) {
+	if (!f) {
 		free_write_pipe(*filp);
-		return PTR_ERR(f);
+		return -ENOMEM;
 	}
 	sub_info.stdin = f;
 
diff --git a/trunk/net/bridge/br_ioctl.c b/trunk/net/bridge/br_ioctl.c
index 4c61a7e0a86e..4e4119a12139 100644
--- a/trunk/net/bridge/br_ioctl.c
+++ b/trunk/net/bridge/br_ioctl.c
@@ -58,13 +58,12 @@ static int get_fdb_entries(struct net_bridge *br, void __user *userbuf,
 {
 	int num;
 	void *buf;
-	size_t size;
+	size_t size = maxnum * sizeof(struct __fdb_entry);
 
-	/* Clamp size to PAGE_SIZE, test maxnum to avoid overflow */
-	if (maxnum > PAGE_SIZE/sizeof(struct __fdb_entry))
+	if (size > PAGE_SIZE) {
+		size = PAGE_SIZE;
 		maxnum = PAGE_SIZE/sizeof(struct __fdb_entry);
-
-	size = maxnum * sizeof(struct __fdb_entry);
+	}
 
 	buf = kmalloc(size, GFP_USER);
 	if (!buf)