From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Mon, 23 Jan 2017 06:59:34 +0000 (-0800)
Subject: Merge branch topic/uek-4.1/rpm-build of git://ca-git.us.oracle.com/linux-uek into... 
X-Git-Tag: v4.1.12-92~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bfdf676951593c8fcc26f1d3e8cbdc06b0884ab2;p=users%2Fjedix%2Flinux-maple.git

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

* topic/uek-4.1/rpm-build:
  net: ena: enable driver in kernel configs
  userfaultfd: enable userfaultfd in UEK OL6 and OL7 configs
  bnxt: enable BNXT_DCB in uek kernel configs
---

bfdf676951593c8fcc26f1d3e8cbdc06b0884ab2