diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-10 15:29:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-10 15:29:44 -0400 |
| commit | 58308451e91974267e1f4a618346055342019e02 (patch) | |
| tree | 68dcd86dc8294dfbfa93a9d5a1653c58e6375116 /include/uapi/linux/ip_vs.h | |
| parent | b44084c2c822f99dd3f2334b288b7e463d222662 (diff) | |
| parent | d04795d6630d85be7359eb06695f8365d53b2c60 (diff) | |
| download | linux-58308451e91974267e1f4a618346055342019e02.tar.gz linux-58308451e91974267e1f4a618346055342019e02.tar.bz2 linux-58308451e91974267e1f4a618346055342019e02.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to i40e only.
Alex provides the majority of the patches against i40e, where he does
cleanup of the Tx and RX queues and to align the code with the known
good Tx/Rx queue code in the ixgbe driver.
Anjali provides an i40e patch to update link events to not print to
the log until the device is administratively up.
Catherine provides a patch to update the driver version.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/ip_vs.h')
0 files changed, 0 insertions, 0 deletions