diff --git a/[refs] b/[refs]
index 3292740b22c2..d266d46bd994 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc1d60a014aa9614518f9856ff661716d0969ffd
+refs/heads/master: a82c53a0e3f57f02782330372b7adad67b417645
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
index 78150038b584..a048ad2130c3 100644
--- a/trunk/fs/splice.c
+++ b/trunk/fs/splice.c
@@ -983,7 +983,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
 
 	while (len) {
 		size_t read_len;
-		loff_t pos = sd->pos;
+		loff_t pos = sd->pos, prev_pos = pos;
 
 		ret = do_splice_to(in, &pos, pipe, len, flags);
 		if (unlikely(ret <= 0))
@@ -998,15 +998,19 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
 		 * could get stuck data in the internal pipe:
 		 */
 		ret = actor(pipe, sd);
-		if (unlikely(ret <= 0))
+		if (unlikely(ret <= 0)) {
+			sd->pos = prev_pos;
 			goto out_release;
+		}
 
 		bytes += ret;
 		len -= ret;
 		sd->pos = pos;
 
-		if (ret < read_len)
+		if (ret < read_len) {
+			sd->pos = prev_pos + ret;
 			goto out_release;
+		}
 	}
 
 done:
@@ -1072,7 +1076,7 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
 
 	ret = splice_direct_to_actor(in, &sd, direct_splice_actor);
 	if (ret > 0)
-		*ppos += ret;
+		*ppos = sd.pos;
 
 	return ret;
 }
diff --git a/trunk/include/asm-frv/mem-layout.h b/trunk/include/asm-frv/mem-layout.h
index 8a15c90431b9..734a1d0583b6 100644
--- a/trunk/include/asm-frv/mem-layout.h
+++ b/trunk/include/asm-frv/mem-layout.h
@@ -31,13 +31,6 @@
 
 #define PAGE_MASK			(~(PAGE_SIZE-1))
 
-/*
- * the slab must be aligned such that load- and store-double instructions don't
- * fault if used
- */
-#define	ARCH_KMALLOC_MINALIGN		(sizeof(long) * 2)
-#define	ARCH_SLAB_MINALIGN		(sizeof(long) * 2)
-
 /*****************************************************************************/
 /*
  * virtual memory layout from kernel's point of view
diff --git a/trunk/include/asm-mn10300/ipcbuf.h b/trunk/include/asm-mn10300/ipcbuf.h
index f6f63d448272..efbbef8d1c69 100644
--- a/trunk/include/asm-mn10300/ipcbuf.h
+++ b/trunk/include/asm-mn10300/ipcbuf.h
@@ -1,4 +1,4 @@
-#ifndef _ASM_IPCBUF_H
+#ifndef _ASM_IPCBUF_H_
 #define _ASM_IPCBUF_H
 
 /*
diff --git a/trunk/kernel/relay.c b/trunk/kernel/relay.c
index bc24dcdc570f..7de644cdec43 100644
--- a/trunk/kernel/relay.c
+++ b/trunk/kernel/relay.c
@@ -1191,7 +1191,7 @@ static ssize_t relay_file_splice_read(struct file *in,
 	ret = 0;
 	spliced = 0;
 
-	while (len) {
+	while (len && !spliced) {
 		ret = subbuf_splice_actor(in, ppos, pipe, len, flags, &nonpad_ret);
 		if (ret < 0)
 			break;