]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch topic/uek-4.1/rpm-build of git://ca-git.us.oracle.com/linux-uek into...
authorChuck Anderson <chuck.anderson@oracle.com>
Mon, 23 Jan 2017 06:59:34 +0000 (22:59 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 23 Jan 2017 06:59:34 +0000 (22:59 -0800)
* 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

1  2 
uek-rpm/ol6/config-x86_64
uek-rpm/ol6/config-x86_64-debug
uek-rpm/ol7/config-x86_64
uek-rpm/ol7/config-x86_64-debug

Simple merge
Simple merge
Simple merge
Simple merge