From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 11 Sep 2015 21:34:13 +0000 (-0700)
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~283
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=30471d04c2a3b1471a28d1ccf898bada2d3fc9ce;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' of git://ca-git.us.oracle.com/linux-uek: (25 commits)
  lib/iommu-common.c: do not use 0xffffffffffffffffl for computing align_mask
  sparc64: use ENTRY/ENDPROC in VISsave
  SPARC64: PORT LDOMS TO UEK4
  Fix incorrect ASI_ST_BLKINIT_MRU_S value
  sparc64: perf: Use UREG_FP rather than UREG_I6
  sparc64: perf: Add sanity checking on addresses in user stack
  sparc64: Convert BUG_ON to warning
  sparc: perf: Disable pagefaults while walking userspace stacks
  sparc: time: Replace update_persistent_clock() with CONFIG_RTC_SYSTOHC
  PCI: Set under_pref for mem64 resource of pcie device
  sparc/PCI: Add mem64 resource parsing for root bus
  PCI: Add pci_bus_addr_t
  sparc64: Fix userspace FPU register corruptions.
  sparc64: using 2048 as default for number of CPUS (cherry picked from commit 578ddb2512a5c908cd17ef8cbc43ff78dd399afd)
  sparc64: iommu-common build error fix (cherry picked from commit accb4c6276793b991c6382bf57a58b40ea17eb11)
  sparc64: fix Setup sysfs to mark LDOM sockets build error (cherry picked from commit 59be02427bfcac6c904ddd1374c35d63155b82d4)
  sparc64: mmap fixed and shared
  sparc64: restore TIF_FREEZE flag for sparc
  sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctly
  sparc: Revert generic IOMMU allocator.
  ...

Conflicts:
	arch/sparc/lib/VISsave.S
	drivers/block/Kconfig
---

30471d04c2a3b1471a28d1ccf898bada2d3fc9ce
diff --cc drivers/block/Kconfig
index 1c8fa13575744,fc6eb17192a90..c131193000983
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@@ -570,6 -570,11 +570,13 @@@ config BLK_DEV_RSX
  	  To compile this driver as a module, choose M here: the
  	  module will be called rsxx.
  
+ config VDS
+ 	tristate "Sun virtual disk server (VDS)"
+ 	depends on SUN_LDOMS
+ 	default m
+ 	help
+ 		Support for Sun logical domain disks.
+ 
 +source "drivers/block/oracleasm/Kconfig"
 +
  endif # BLK_DEV