From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Dec 2014 21:15:12 +0000 (-0800)
Subject: Merge tag 'linux-kselftest-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.19-rc1~63
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=61de8e53640ceeda564a65170a46c1edc2b37e11;p=linux-2.6-block.git

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

Pull kselftest update from Shuah Khan:
 "kselftest updates for 3.19-rc1:

   - kcmp test include file cleanup
   - kcmp change to build on all architectures
   - A light weight kselftest framework that provides a set of
     interfaces for tests to use to report results.  In addition,
     several tests are updated to use the framework.
   - A new runtime system size test that prints the amount of RAM that
     the currently running system is using"

* tag 'linux-kselftest-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftest: size: Add size test for Linux kernel
  selftests/kcmp: Always try to build the test
  selftests/kcmp: Don't include kernel headers
  kcmp: Move kcmp.h into uapi
  selftests/timers: change test to use ksft framework
  selftests/kcmp: change test to use ksft framework
  selftests/ipc: change test to use ksft framework
  selftests/breakpoints: change test to use ksft framework
  selftests: add kselftest framework for uniform test reporting
  selftests/user: move test out of Makefile into a shell script
  selftests/net: move test out of Makefile into a shell script
---

61de8e53640ceeda564a65170a46c1edc2b37e11
diff --cc include/uapi/linux/Kbuild
index cea258f1d9d2,1cf50d682dbf..259d31fc9073
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@@ -212,11 -209,12 +212,12 @@@ header-y += ivtv.
  header-y += ixjuser.h
  header-y += jffs2.h
  header-y += joystick.h
+ header-y += kcmp.h
 -header-y += kd.h
  header-y += kdev_t.h
 -header-y += kernel-page-flags.h
 -header-y += kernel.h
 +header-y += kd.h
  header-y += kernelcapi.h
 +header-y += kernel.h
 +header-y += kernel-page-flags.h
  header-y += kexec.h
  header-y += keyboard.h
  header-y += keyctl.h
diff --cc tools/testing/selftests/Makefile
index c14893b501a9,fa91aefc8d19..b3831f4ba845
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -15,7 -15,7 +15,8 @@@ TARGETS += use
  TARGETS += sysctl
  TARGETS += firmware
  TARGETS += ftrace
 +TARGETS += exec
+ TARGETS += size
  
  TARGETS_HOTPLUG = cpu-hotplug
  TARGETS_HOTPLUG += memory-hotplug