]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'uek4/xsa155' of git://ca-git.us.oracle.com/linux-konrad-public into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 8 Jan 2016 16:51:04 +0000 (08:51 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 8 Jan 2016 16:51:04 +0000 (08:51 -0800)
* '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()


Trivial merge