From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Tue, 7 Feb 2017 05:57:51 +0000 (-0800)
Subject: Merge branch topic/uek-4.1/xen of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1
X-Git-Tag: v4.1.12-92~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8a371cd465ddae736e02cb32ab5949124f35969f;p=users%2Fjedix%2Flinux-maple.git

Merge branch topic/uek-4.1/xen of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* topic/uek-4.1/xen:
  xen-netback: fix extra_info handling in xenvif_tx_err()
---

8a371cd465ddae736e02cb32ab5949124f35969f