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

diff --cc arch/x86/include/asm/apic.h
Simple merge

diff --cc arch/x86/kvm/vmx.c
Simple merge

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc block/bio.c
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc crypto/af_alg.c
Simple merge

diff --cc crypto/asymmetric_keys/Makefile
Simple merge

diff --cc crypto/asymmetric_keys/x509_public_key.c
Simple merge

diff --cc drivers/infiniband/ulp/isert/ib_isert.c
Simple merge

diff --cc drivers/md/dm-snap.c
Simple merge

diff --cc drivers/md/dm-thin.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

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

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

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

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

diff --cc drivers/scsi/be2iscsi/be_main.c
Simple merge

diff --cc drivers/usb/core/hub.c
index 282d88d2d9a4d7df1d85568df864a77294411a5d,3b6a4ac9b14d6c0a9642defa8ab84beeb9e88da7..5667a109596bcd2a1e96eb1132fe637cdd59f5e4
--- 1/drivers/usb/core/hub.c
--- 2/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@@ -4335,11 -4319,10 +4335,11 @@@ hub_port_init (struct usb_hub *hub, str
         * first 8 bytes of the device descriptor to get the ep0 maxpacket
         * value.
         */
-       for (i = 0; i < GET_DESCRIPTOR_TRIES; (++i, msleep(100))) {
+       for (retries = 0; retries < GET_DESCRIPTOR_TRIES; (++retries, msleep(100))) {
                bool did_new_scheme = false;
  
 -              if (use_new_scheme(udev, retry_counter)) {
 +              if (use_new_scheme(udev, retry_counter) &&
 +                  !(hcd->driver->flags & HCD_USB3)) {
                        struct usb_device_descriptor *buf;
                        int r = 0;
  

diff --cc drivers/usb/host/xhci.c
Simple merge

diff --cc fs/btrfs/backref.c
Simple merge

diff --cc fs/btrfs/delayed-inode.c
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/btrfs/send.c
Simple merge

diff --cc fs/btrfs/tree-log.c
Simple merge

diff --cc fs/btrfs/volumes.c
Simple merge

diff --cc fs/direct-io.c
Simple merge

diff --cc fs/fuse/cuse.c
Simple merge

diff --cc fs/fuse/file.c
Simple merge

diff --cc fs/fuse/fuse_i.h
Simple merge

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

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

diff --cc fs/splice.c
Simple merge

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

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

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

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc kernel/ptrace.c
Simple merge

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

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/ceph/messenger.c
Simple merge

diff --cc net/ipv4/devinet.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/phonet/af_phonet.c
Simple merge

diff --cc net/sctp/protocol.c
Simple merge

diff --cc net/sctp/sm_sideeffect.c
Simple merge

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