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

* topic/uek-4.1/sparc: (32 commits)
  sparc: fix kernel panic caused by vio handshake
  sparc64: Add sensible read values for /proc/<pid>/sparc_adi
  sparc64: Add ability to set the mcde state for a process
  sparc64: Add proc files specific to ADI
  sparc64: add mcd_on_by_default
  Revert "sparc: fix intermittent LDom hang waiting for vdc_port_up"
  sparc64: Add support for ADI (Application Data Integrity)
  sparc64: Add support for ADI register fields, ASIs and traps
  mm: Add functions to support extra actions on swap in/out
  signals, sparc: Add signal codes for ADI violations
  sparc64: shut down to OBP correctly
  sparc64: fix for user probes in high memory
  sparc64: Use online cpus instead of present cpus during hotplug.
  sparc64: Update cpumaps correctly during hotplug.
  sparc: fix intermittent LDom hang waiting for vdc_port_up
  arch/sparc: Add a dedicated clear_page and clear_user_page for M7
  sparc64: perf: Enable dynamic tracepoints when using perf probe
  SPARC64: UEK4 LDOMS DOMAIN SERVICES UPDATE 7
  arch/sparc: Fix indexing msi_msiqid_table and msi_irq_table
  arch/sparc: Clear msi_msiqid_table during teardown
  ...

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/sparc/include/asm/pgtable_64.h
Simple merge

diff --cc arch/sparc/kernel/ldc.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc include/asm-generic/pgtable.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/rmap.c
Simple merge