From fd8831877332b1bb0b460727de6dbb112aa42536 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 2 Oct 2007 10:33:49 -0700
Subject: [PATCH] --- yaml --- r: 65244 b: refs/heads/master c:
 e80eaf9904d5b19512265e1435372b2e12146a5f h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/Makefile                       | 2 +-
 trunk/arch/mips/kernel/vmlinux.lds.S | 2 ++
 trunk/arch/x86_64/vdso/voffset.h     | 2 +-
 trunk/include/asm-mips/fcntl.h       | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1c5f5b146f63..f7b73fa56896 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e48395f1753cab0fde6c03f1db833cece9ef2ba0
+refs/heads/master: e80eaf9904d5b19512265e1435372b2e12146a5f
diff --git a/trunk/Makefile b/trunk/Makefile
index 4dac25301d5f..6fc97bfea36c 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 23
-EXTRAVERSION =-rc8
+EXTRAVERSION =-rc9
 NAME = Arr Matey! A Hairy Bilge Rat!
 
 # *DOCUMENTATION*
diff --git a/trunk/arch/mips/kernel/vmlinux.lds.S b/trunk/arch/mips/kernel/vmlinux.lds.S
index 60bbaecde187..087ab997487d 100644
--- a/trunk/arch/mips/kernel/vmlinux.lds.S
+++ b/trunk/arch/mips/kernel/vmlinux.lds.S
@@ -45,6 +45,8 @@ SECTIONS
   __dbe_table : { *(__dbe_table) }
   __stop___dbe_table = .;
 
+  NOTES
+
   RODATA
 
   /* writeable */
diff --git a/trunk/arch/x86_64/vdso/voffset.h b/trunk/arch/x86_64/vdso/voffset.h
index 5304204911f2..4af67c79085f 100644
--- a/trunk/arch/x86_64/vdso/voffset.h
+++ b/trunk/arch/x86_64/vdso/voffset.h
@@ -1 +1 @@
-#define VDSO_TEXT_OFFSET 0x500
+#define VDSO_TEXT_OFFSET 0x600
diff --git a/trunk/include/asm-mips/fcntl.h b/trunk/include/asm-mips/fcntl.h
index 00a50ec1c19f..2a52333a062d 100644
--- a/trunk/include/asm-mips/fcntl.h
+++ b/trunk/include/asm-mips/fcntl.h
@@ -13,6 +13,7 @@
 #define O_SYNC		0x0010
 #define O_NONBLOCK	0x0080
 #define O_CREAT         0x0100	/* not fcntl */
+#define O_TRUNC		0x0200	/* not fcntl */
 #define O_EXCL		0x0400	/* not fcntl */
 #define O_NOCTTY	0x0800	/* not fcntl */
 #define FASYNC		0x1000	/* fcntl, for BSD compatibility */