Update to 3.14.12

Drop x86 ptrace patch which is included in it.

Ignore or work around various ABI changes.

svn path=/dists/sid/linux/; revision=21525

2 files changed, 51 insertions, 0 deletions

diff --git a/debian/patches/debian/blkcg-avoid-abi-change-in-3.14.12.patch b/debian/patches/debian/blkcg-avoid-abi-change-in-3.14.12.patch
new file mode 100644
index 000000000..050c77fbc
--- /dev/null
+++ b/debian/patches/debian/blkcg-avoid-abi-change-in-3.14.12.patch
@@ -0,0 +1,33 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Fri, 11 Jul 2014 17:41:42 +0100
+Subject: blkcg: Avoid ABI change in 3.14.12
+
+The type of blkcg_gq::refcnt was changed from int to atomic_t,
+and reference counting now requires atomic operations.  None
+of the in-tree users are modular and this structure isn't exposed
+OOT, so we can hide this change.
+
+--- a/block/blk-cgroup.h
++++ b/block/blk-cgroup.h
+@@ -18,7 +18,9 @@
+ #include <linux/seq_file.h>
+ #include <linux/radix-tree.h>
+ #include <linux/blkdev.h>
++#ifndef __GENKSYMS__
+ #include <linux/atomic.h>
++#endif
+ 
+ /* Max limits for throttle policy */
+ #define THROTL_IOPS_MAX		UINT_MAX
+@@ -105,7 +107,11 @@ struct blkcg_gq {
+ 	struct request_list		rl;
+ 
+ 	/* reference count */
++#ifndef __GENKSYMS__
+ 	atomic_t			refcnt;
++#else
++	int				refcnt;
++#endif
+ 
+ 	/* is this blkg online? protected by both blkcg and q locks */
+ 	bool				online;
diff --git a/debian/patches/debian/trace-syscall-avoid-abi-change-in-3.14.11.patch b/debian/patches/debian/trace-syscall-avoid-abi-change-in-3.14.11.patch
new file mode 100644
index 000000000..cf156dd9e
--- /dev/null
+++ b/debian/patches/debian/trace-syscall-avoid-abi-change-in-3.14.11.patch
@@ -0,0 +1,18 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Fri, 11 Jul 2014 09:07:00 +0100
+Subject: trace/syscall: Avoid ABI change in 3.14.11
+
+Hide the added #include from genksyms.
+
+--- a/include/trace/syscall.h
++++ b/include/trace/syscall.h
+@@ -4,7 +4,9 @@
+ #include <linux/tracepoint.h>
+ #include <linux/unistd.h>
+ #include <linux/ftrace_event.h>
++#ifndef __GENKSYMS__
+ #include <linux/thread_info.h>
++#endif
+ 
+ #include <asm/ptrace.h>
+