[linux-tools] 02/04: Merge tag 'debian/4.2-2'

[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 2f0a4173ed46b2e70b0ab2b9941589b584e6ca51
Merge: ec98f72 c24544e
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Oct 6 23:57:50 2015 +0100

    Merge tag 'debian/4.2-2'

 debian/build/tools/perf/Makefile                   |  5 +-
 debian/changelog                                   |  8 ++++
 ...-add-support-for-__sane_userspace_types__.patch | 56 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules.real                                  |  4 +-
 debian/templates/control.main.in                   |  4 +-
 6 files changed, 73 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 8bf1d31,b7a4494..6642b80
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
 +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-2) unstable; urgency=medium
+ 
+   * [x32] Don't attempt to build linux-perf (fixes FTBFS)
+   * [x32] Build hyperv-daemons package
+   * [alpha] uapi: Add support for __SANE_USERSPACE_TYPES__(fixes FTBFS)
+ 
+  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 02 Oct 2015 18:41:22 +0100
+ 
  linux-tools (4.2-1) unstable; urgency=medium
  
    * New upstream release

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