diff options
author | David S. Miller <davem@davemloft.net> | 2019-10-31 03:51:25 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-10-31 03:51:25 +0300 |
commit | dba7bf0348e47c2adc2994e811473ef3cd216e3b (patch) | |
tree | cc0c5a8db119122a2f9c51009722e3f5254813b0 /net/qrtr/tun.c | |
parent | 84e93d999a677ee3229e244e9eb29209c3bb6677 (diff) | |
parent | 203bddfdfb6c2c542885b3da1a7d011fd54744db (diff) | |
download | linux-dba7bf0348e47c2adc2994e811473ef3cd216e3b.tar.xz |
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:
====================
1GbE Intel Wired LAN Driver Updates 2019-10-29
This series contains updates to e1000e, igb, ixgbe and i40e drivers.
Sasha adds support for Intel client platforms Comet Lake and Tiger Lake
to the e1000e driver. Also adds a fix for a compiler warning that was
recently introduced, when CONFIG_PM_SLEEP is not defined, so wrap the
code that requires this kernel configuration to be defined.
Alex fixes a potential race condition between network configuration and
power management for e1000e, which is similar to a past issue in the igb
driver. Also provided a bit of code cleanup since the driver no longer
checks for __E1000_DOWN.
Josh Hunt adds UDP segmentation offload support for igb, ixgbe and i40e.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/qrtr/tun.c')
0 files changed, 0 insertions, 0 deletions