Merge branch topic/uek-4.1/rpm-build of git://ca-git.us.oracle.com/linux-uek into...

* topic/uek-4.1/rpm-build:
  perf: build TUI by default by pulling in slang and linking it statically
  configs: ol6: set with_headers, with_dtrace defaults to 0
  smartpqi: enable driver in uek config files
  Add the CONFIG_DEBUG_SET_MODULE_RONX option to OL6

diff --cc uek-rpm/ol6/config-x86_64
Simple merge

diff --cc uek-rpm/ol6/config-x86_64-debug
Simple merge

diff --cc uek-rpm/ol7/config-x86_64
Simple merge

diff --cc uek-rpm/ol7/config-x86_64-debug
Simple merge