[linux-tools] 01/04: Update to 4.3-rc3

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux-tools.

commit ec98f72b189b9868b0321b475407fe6e16fdbdd2
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Oct 6 23:55:28 2015 +0100

    Update to 4.3-rc3
---
 debian/changelog                                   |  6 +++
 debian/patches/lockdep-fix-headers.patch           | 51 +---------------------
 debian/patches/series                              |  1 -
 ...pty-build-files-for-architectures-lacking.patch | 27 ------------
 4 files changed, 7 insertions(+), 78 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b79a39..8bf1d31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-tools (4.3~rc3-1~exp1) UNRELEASED; urgency=medium
+
+  * New upstream release candidate
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 28 Sep 2015 01:54:21 +0100
+
 linux-tools (4.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/lockdep-fix-headers.patch b/debian/patches/lockdep-fix-headers.patch
index 95f1616..e2c1db8 100644
--- a/debian/patches/lockdep-fix-headers.patch
+++ b/debian/patches/lockdep-fix-headers.patch
@@ -1,49 +1,9 @@
 From: Ben Hutchings <ben at decadent.org.uk>
 Date: Thu, 13 Aug 2015 20:48:12 +0200
-Subject: liblockdep: Add more headers and definitions needed by lockdep
+Subject: liblockdep: Define WRITE_ONCE(), used by <linux/rbtree_augmented.h>.
 
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 ---
---- /dev/null
-+++ b/tools/lib/lockdep/uinclude/linux/export.h
-@@ -0,0 +1,10 @@
-+#ifndef _LINUX_EXPORT_H
-+#define _LINUX_EXPORT_H
-+
-+#define EXPORT_SYMBOL(sym)
-+#define EXPORT_SYMBOL_GPL(sym)
-+#define EXPORT_SYMBOL_GPL_FUTURE(sym)
-+#define EXPORT_UNUSED_SYMBOL(sym)
-+#define EXPORT_UNUSED_SYMBOL_GPL(sym)
-+
-+#endif /* _LINUX_EXPORT_H */
---- a/tools/lib/lockdep/uinclude/linux/kernel.h
-+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
-@@ -23,7 +23,7 @@
- #define WARN_ON(x) (x)
- #define WARN_ON_ONCE(x) (x)
- #define likely(x) (x)
--#define WARN(x, y, z) (x)
-+#define WARN(x, y...) (x)
- #define uninitialized_var(x) x
- #define __init
- #define noinline
---- a/tools/lib/lockdep/preload.c
-+++ b/tools/lib/lockdep/preload.c
-@@ -5,7 +5,7 @@
- #include <stdlib.h>
- #include <sysexits.h>
- #include "include/liblockdep/mutex.h"
--#include "../../../include/linux/rbtree.h"
-+#include <linux/rbtree.h>
- 
- /**
-  * struct lock_lookup - liblockdep's view of a single unique lock
---- a/tools/lib/lockdep/uinclude/linux/rbtree.h
-+++ b/tools/lib/lockdep/uinclude/linux/rbtree.h
-@@ -1 +1 @@
--#include "../../../include/linux/rbtree.h"
-+#include "../../include/linux/rbtree.h"
 --- a/tools/lib/lockdep/uinclude/linux/compiler.h
 +++ b/tools/lib/lockdep/uinclude/linux/compiler.h
 @@ -4,4 +4,10 @@
@@ -57,12 +17,3 @@ Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 +#define WRITE_ONCE(x, val) (ACCESS_ONCE(x) = (val))
 +
  #endif
---- a/tools/lib/lockdep/uinclude/linux/rcu.h
-+++ b/tools/lib/lockdep/uinclude/linux/rcu.h
-@@ -18,4 +18,6 @@ static inline bool rcu_is_watching(void)
- 	return false;
- }
- 
-+#define RCU_INIT_POINTER(p, v) (p = v)
-+
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index 97b2e64..2632af5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ usbip-document-tcp-wrappers.patch
 kbuild-fix-recordmcount-dependency.patch
 usbip-include-uninstalled-linux-usbip-h.patch
 tools-perf-man-date.patch
-tools-perf-add-empty-build-files-for-architectures-lacking.patch
 lockdep-fix-oot-build.patch
 lockdep-fix-headers.patch
 lockdep-fix-soname.patch
diff --git a/debian/patches/tools-perf-add-empty-build-files-for-architectures-lacking.patch b/debian/patches/tools-perf-add-empty-build-files-for-architectures-lacking.patch
deleted file mode 100644
index f648d58..0000000
--- a/debian/patches/tools-perf-add-empty-build-files-for-architectures-lacking.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Ben Hutchings <ben at decadent.org.uk>
-Date: Tue, 04 Aug 2015 16:59:53 +0100
-Subject: tools/perf: Add empty Build files for architectures lacking them
-Forwarded: http://mid.gmane.org/1438704627.7315.2.camel@decadent.org.uk
-
-perf currently fails to build on MIPS as there is no
-tools/perf/arch/mips/Build file.  Adding an empty file fixes this as
-there are no MIPS-specific sources to build.
-
-It looks like the same is needed for Alpha and PA-RISC, though I
-haven't been able to test those.
-
-Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
-Fixes: 5e8c0fb6a957 ("perf build: Add arch x86 objects building")
----
---- /dev/null
-+++ b/tools/perf/arch/alpha/Build
-@@ -0,0 +1 @@
-+# empty
---- /dev/null
-+++ b/tools/perf/arch/mips/Build
-@@ -0,0 +1,1 @@
-+# empty
---- /dev/null
-+++ b/tools/perf/arch/parisc/Build
-@@ -0,0 +1 @@
-+# empty

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-tools.git