From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Mon, 23 Jan 2017 07:24:30 +0000 (-0800)
Subject: Merge branch topic/uek-4.1/sparc of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7297e2fadf4d04446ef40e607dd1d25637661213;p=users%2Fjedix%2Flinux-maple.git

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

* topic/uek-4.1/sparc:
  Revert "sparc64: struct adi_caps should use __u64, not u64"
  SPARC64: ds driver: Make memory allocations ATOMIC and enhance debugging
  sparc64: Add symbolic access to M7 performance counters to perf
  sonoma: perf: add support for sonoma (s7) into perf
  sparc64:M8 cpu recognition typo fix
  sparc64: Add M7 hardware cache events into perf
  sparc64: Fix the watchdog corrupting performance counters
  sparc64: Fix incorrect counting when using multiple perf counters
  sparc64: Fix a race condition when stopping performance counters
  sparc64: Stop performance counter before updating
  sparc64: enable cpu hotplug feature for UEK4
  sparc64: release thirds level cache reference for cpu hotplug feature
  sparc64: fix compile warning section mismatch in find_node()
  sparc64: fix sun4v_build_irq NULL pointer dereference
  SPARC64: ldmvsw: tx queue stuck in stopped state after LDC reset
  sparc: Implement watchdog_nmi_enable and watchdog_nmi_disable
  sparc64: Setup a scheduling domain for highest level cache.
---

7297e2fadf4d04446ef40e607dd1d25637661213