From: David S. Miller Date: Fri, 9 May 2014 17:10:12 +0000 (-0400) Subject: Merge branch 'qlcnic-next' X-Git-Tag: v3.16-rc1~27^2~260 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fe6f397c433c43a4404259d6ee3f1200b9a6d97e;p=linux.git Merge branch 'qlcnic-next' Rajesh Borundia says: ==================== qlcnic: SR-IOV and FW-dump enhancements This patch series contain following enhancements. * SR-IOV enhancements: - Allow SR-IOV VF's to probe in hypervisor. SR-IOV VF can be uplinked to bridge/macvtap device with this change. - Commands from VF are processed in process context as it may sleep during PF-VF communication. Earlier we use to process qlcnic_sriov_vf_set_multi function in process context but now we process individual commands. - As SR-IOV VF's can be uplinked to bridge/macvtap device support mac-learning to allow communication through embedded switch. * FW-dump enhancement: - Support to collect RDMEM section of firmware dump using PEX DMA method for 82xx series adapter. * Changes in v2: - Removed unnecessary cast from void pointer to something else and verified this issue in entire patch series as per David Miller's suggestion. Please apply this series to net-next. ==================== Signed-off-by: David S. Miller --- fe6f397c433c43a4404259d6ee3f1200b9a6d97e