Merge changes from sid up to 3.13.10-1

svn path=/dists/trunk/linux/; revision=21240

2 files changed, 67 insertions, 0 deletions

diff --git a/debian/patches/debian/trace-avoid-abi-change-in-3.13.8.patch b/debian/patches/debian/trace-avoid-abi-change-in-3.13.8.patch
new file mode 100644
index 000000000..02a887e09
--- /dev/null
+++ b/debian/patches/debian/trace-avoid-abi-change-in-3.13.8.patch
@@ -0,0 +1,20 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Tue, 15 Apr 2014 22:05:04 +0100
+Subject: trace: Avoid ABI change in 3.13.8
+Forwarded: not-needed
+
+--- a/kernel/trace/trace_events.c
++++ b/kernel/trace/trace_events.c
+@@ -27,6 +27,12 @@
+ 
+ DEFINE_MUTEX(event_mutex);
+ 
++/* Should no longer be used, but kept for compatibility with older modules */
++DEFINE_MUTEX(event_storage_mutex);
++EXPORT_SYMBOL_GPL(event_storage_mutex);
++char event_storage[128];
++EXPORT_SYMBOL_GPL(event_storage);
++
+ LIST_HEAD(ftrace_events);
+ static LIST_HEAD(ftrace_common_fields);
+ 
diff --git a/debian/patches/debian/vfs-avoid-abi-change-in-3.13.9.patch b/debian/patches/debian/vfs-avoid-abi-change-in-3.13.9.patch
new file mode 100644
index 000000000..43d6384f2
--- /dev/null
+++ b/debian/patches/debian/vfs-avoid-abi-change-in-3.13.9.patch
@@ -0,0 +1,47 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Tue, 15 Apr 2014 21:56:00 +0100
+Subject: vfs: Avoid ABI change in 3.13.9
+Forwarded: not-needed
+
+--- a/fs/mount.h
++++ b/fs/mount.h
+@@ -18,14 +18,27 @@ struct mnt_pcp {
+ 	int mnt_writers;
+ };
+ 
++/*
++ * These structures are not exposed to modules, but changes somehow
++ * still affect exported symbol versions!
++ */
++
+ struct mountpoint {
++#ifdef __GENKSYMS__
++	struct list_head m_hash; /* not really */
++#else
+ 	struct hlist_node m_hash;
++#endif
+ 	struct dentry *m_dentry;
+ 	int m_count;
+ };
+ 
+ struct mount {
++#ifdef __GENKSYMS__
++	struct list_head mnt_hash; /* not really */
++#else
+ 	struct hlist_node mnt_hash;
++#endif
+ 	struct mount *mnt_parent;
+ 	struct dentry *mnt_mountpoint;
+ 	struct vfsmount mnt;
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -23,7 +23,9 @@
+ #include <linux/uaccess.h>
+ #include <linux/proc_ns.h>
+ #include <linux/magic.h>
++#ifndef __GENKSYMS__
+ #include <linux/bootmem.h>
++#endif
+ #include "pnode.h"
+ #include "internal.h"
+