Merge branch 'ctf' into uek/uek-4.1-QU6-next

diff --cc kernel/Makefile
index 87d18866acc4b1116285e99bc02b65d038e01c18,6e6e12873c437de3f51a8cf285a8a32f1fece68c..24d1bd4de444b140f90961c6b793801135f24e48
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -101,10 -99,6 +101,9 @@@ obj-$(CONFIG_JUMP_LABEL) += jump_label.
  obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o
  obj-$(CONFIG_TORTURE_TEST) += torture.o
  obj-$(CONFIG_DTRACE) += dtrace/
- obj-$(CONFIG_CTF) += ctf/
 +obj-$(CONFIG_KSPLICE) += ksplice.o
 +
 +obj-$(CONFIG_HAS_IOMEM) += memremap.o
  
  $(obj)/configs.o: $(obj)/config_data.h
  

diff --cc lib/Kconfig
Simple merge