From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Fri, 5 Feb 2016 14:14:31 +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~198
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6d32c0a0bb27df2579b71db7d950396c18d077ad;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: (24 commits)
  sparc64: Fix perf performance counter overflow calculation
  sparc64: Fix for perf event counts sometimes reported as negative numbers
  sparc64: Fix numa node distance initialization
  sparc64: fix incorrect sign extension in sys_sparc64_personality
  sparc64: Add ADI capability to cpu capabilities
  sunvnet: Initialize network_header and transport_header in vnet_rx_one()
  Add support for polling to the sunhv serial driver.
  Add sun4v_wdt watchdog driver
  sparc64: Make memory allocations ATOMIC to fix lockdep warnings
  sunvnet: hack to work around Solaris VIO bug
  sparc64: fix FP corruption in user copy functions
  sparc64: Don't set %pil in rtrap_nmi too early
  sparc64: 'NULL' char after break when sysrq enabled
  sparc64: Fix numa distance values
  sparc64: Fix segfaults and incorrect data collection by perf
  ldoms: VDS panics with regular file backend. ldoms: VIO FLUSH not implemented correctly.
  i40e: Temporary workaround for DMA map issue
  SPARC64: UEK4 LDOMS DOMAIN SERVICES UPDATE 2
  VCC panics after guest is deleted. VCC sends HUP instead of BREAK.
  Do not execute i40e_macaddr_init if the macaddr is default
  ...

Conflicts:
	drivers/pci/quirks.c
---

6d32c0a0bb27df2579b71db7d950396c18d077ad