From: David S. Miller Date: Thu, 4 Jun 2015 03:19:16 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next... X-Git-Tag: Ubuntu-5.13.0-19.19~17766^2~143 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=633cc5fe768c0223f80637527eb9be916bcaa9ee;p=mirror_ubuntu-jammy-kernel.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2015-06-03 This series contains updates to e1000e only. Yanir provides 8 fixes and 1 version bump for e1000e. First fix resolves a possible unit hang if multiple descriptors are available in the rings during reset or runtime suspend. Fixed a warning on SPARC compile based on a suggested solution from Alex Duyck. Fixed a logical error, where a "if" condition under which a flush should occur, was revered. Fixed a hardware issue that prevented i219 from working in legacy interrupts mode. Fixed the hardware clock configuration and suprious non-linear increment. Lastly, fixed a system hang which occurred during execution of "ethtool -t ", by disabling MULR for the loopback test to avoid the hand state. ==================== Signed-off-by: David S. Miller --- 633cc5fe768c0223f80637527eb9be916bcaa9ee