Merge remote-tracking branch 'kselftest/next'

diff --cc tools/testing/selftests/Makefile
index 2cb20b7,b217958..37fa36c
--- 1/tools/testing/selftests/Makefile
--- 2/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -21,9 -20,9 +21,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