From: Santosh Shilimkar Date: Fri, 8 Jan 2016 16:51:04 +0000 (-0800) Subject: Merge branch 'uek4/xsa155' of git://ca-git.us.oracle.com/linux-konrad-public into... X-Git-Tag: v4.1.12-92~208^2~3 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2b3c3e3ad1208e4df08f52b7a591d6cfccd65e41;p=users%2Fjedix%2Flinux-maple.git Merge branch 'uek4/xsa155' of git://ca-git.us.oracle.com/linux-konrad-public into topic/uek-4.1/xen * 'uek4/xsa155' of git://ca-git.us.oracle.com/linux-konrad-public: xen/pciback: Save xen_pci_op commands before processing it xen-scsiback: safely copy requests xen-blkback: read from indirect descriptors only once xen-blkback: only read request operation from shared ring once xen-netback: use RING_COPY_REQUEST() throughout xen-netback: don't use last request to determine minimum Tx credit xen: Add RING_COPY_REQUEST() --- 2b3c3e3ad1208e4df08f52b7a591d6cfccd65e41