From: Santosh Shilimkar Date: Tue, 20 Oct 2015 01:18:46 +0000 (-0700) Subject: Merge branch 'topic/uek-4.1/drivers' of git://ca-git.us.oracle.com/linux-uek into... X-Git-Tag: v4.1.12-92~259 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a3b78d70708cafaab1dc8bfa7cd3f6add6f05ccd;p=users%2Fjedix%2Flinux-maple.git Merge branch 'topic/uek-4.1/drivers' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1 * 'topic/uek-4.1/drivers' of git://ca-git.us.oracle.com/linux-uek: (122 commits) be2net: bump up the driver version to 10.6.0.4 enic: do hang reset only in case of tx timeout enic: handle spurious error interrupt enic: reduce ioread in devcmd2 enic: Fix build failure with SRIOV disabled. enic: Fix namespace pollution causing build errors. enic: Fix sparse warning in vnic_devcmd_init(). enic: add devcmd2 enic: add devcmd2 resources enic: use netdev_ or dev_ instead of pr_ enic: move struct definition from .c to .h file enic: allow adaptive coalesce setting for msi/legacy intr enic: add adaptive coalescing intr for intx and msi poll enic: fix issues in enic_poll enic: use atomic_t instead of spin_lock in busy poll drivers/net: remove all references to obsolete Ethernet-HOWTO enic: Grammar s/an negative/a negative/ qla2xxx: Update driver version to 8.07.00.26.39.0-k. be2net: remove vlan promisc capability from VF's profile descriptors be2net: set pci_func_num while issuing GET_PROFILE_CONFIG cmd ... --- a3b78d70708cafaab1dc8bfa7cd3f6add6f05ccd