From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Sep 2015 00:39:10 +0000 (-0700)
Subject: Merge tag 'linux-kselftest-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.3-rc1~42
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=54283aed90c3cf353e2c01a1d1ca853f5eedf92a

Merge tag 'linux-kselftest-4.3-rc1' of git://git./linux/kernel/git/shuah/linux-kselftest

Pull kselftest update from Shuah Khan:
 "This update adds new zram test and fixes to problems found during
  testing this new zram test.  In addition, there are a few bug fixes
  and ksefltest improvement patches from Linaro developers.

  I will send another update later on this week to fix kselftest
  breakage due to commit 2bf9e0ab08c6 ("locking/static_keys: Provide a
  selftest") after the fix soaks in next for a couple of days"

* tag 'linux-kselftest-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/zram: Makefile fix
  selftests/zram: must be run as root
  selftests: breakpoints: fix installing error on the architecture except x86
  selftests: check before install
  selftests/zram: Adding zram tests
---

54283aed90c3cf353e2c01a1d1ca853f5eedf92a
diff --cc tools/testing/selftests/Makefile
index b8f12e0897e6,b2179587c8fe..050151144596
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -20,9 -20,9 +20,10 @@@ ifneq (1, $(quicktest)
  TARGETS += timers
  endif
  TARGETS += user
 +TARGETS += jumplabel
  TARGETS += vm
  TARGETS += x86
+ TARGETS += zram
  #Please keep the TARGETS list alphabetically sorted
  # Run "make quicktest=1 run_tests" or
  # "make quicktest=1 kselftest from top level Makefile