Merge branch 'topic/uek-4.1/stable-cherry-picks' of git://ca-git.us.oracle.com/linux...

* 'topic/uek-4.1/stable-cherry-picks' of git://ca-git.us.oracle.com/linux-uek: (252 commits)
  Linux 4.1.12
  sched/preempt, powerpc, kvm: Use need_resched() instead of should_resched()
  sched/preempt, xen: Use need_resched() instead of should_resched()
  nfs4: have do_vfs_lock take an inode pointer
  locks: inline posix_lock_file_wait and flock_lock_file_wait
  locks: new helpers - flock_lock_inode_wait and posix_lock_inode_wait
  locks: have flock_lock_file take an inode pointer instead of a filp
  svcrdma: handle rdma read with a non-zero initial page offset
  arm64: Fix THP protection change logic
  pinctrl: imx25: ensure that a pin with id i is at position i in the info array
  sched/preempt: Fix cond_resched_lock() and cond_resched_softirq()
  sched/preempt: Rename PREEMPT_CHECK_OFFSET to PREEMPT_DISABLE_OFFSET
  rbd: fix double free on rbd_dev->header_name
  dm thin: fix missing pool reference count decrement in pool_ctr error path
  drm/radeon: add pm sysfs files late
  drm/radeon: attach tile property to mst connector
  drm/dp/mst: make mst i2c transfer code more robust.
  drm/nouveau/fbcon: take runpm reference when userspace has an open fd
  workqueue: make sure delayed work run in local cpu
  i2c: designware-platdrv: enable RuntimePM before registering to the core
  ...

diff --cc Makefile
Simple merge

diff --cc arch/x86/kernel/alternative.c
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event_intel.c
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/cpufreq/intel_pstate.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ppp/pppoe.c
Simple merge

diff --cc drivers/pci/bus.c
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmmaster.c
Simple merge

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

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

diff --cc include/net/sock.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/sched.h
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/l2tp/l2tp_core.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_sync.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge

diff --cc virt/kvm/eventfd.c
Simple merge