From: Nick Alcock <nick.alcock@oracle.com>
Date: Fri, 22 Sep 2017 11:45:10 +0000 (+0100)
Subject: Merge branch 'ctf' into uek/uek-4.1-QU6-next
X-Git-Tag: v4.1.12-117.0_27200813_3~345
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0449f94878427deecba6f1588c443db438a90e94;p=users%2Fjedix%2Flinux-maple.git

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

0449f94878427deecba6f1588c443db438a90e94
diff --cc kernel/Makefile
index 87d18866acc4,6e6e12873c43..24d1bd4de444
--- a/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