From: David S. Miller Date: Wed, 25 Nov 2015 18:58:06 +0000 (-0500) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next... X-Git-Tag: v5.15~13995^2~584 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00cc3679187a5306e76fd21832ddfd7e5604b7c3;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'master' of git://git./linux/kernel/git/jkirsher/next-queue Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2015-11-25 This series contains updates to fm10k, i40e and i40evf. Alex Duyck fixes up fm10k to use napi_schedule_irqoff() instead of napi_schedule() since the function it is called from runs from hard interrupt context or with interrupts already disabled in netpoll. Shannon cleans up i40e and i40evf unused cd_tunneling parameter and any code comments that refer to it. Then clean up a few instances of BUG_ON, based on a Linux diatribe, especially when WARN_ON can be used. Helin fixed a issue where using ethtool RXNFC command could let receive flow hash could be set on disabled queues, so resolve by returning the number of enabled queues before setting RXNFC. Anjali fixes a MSS issue where the hardware/NVM sets a limit of no less than 256 bytes for MSS, yet the stack can send as low as 76 byte MSS. Fixed the issue by lowering the hardware limit to 64 bytes to avoid MDDs from firing and causing a reset when the MSS is lower than 256. Added a statistic to track how many times we forced to do a write back on transmit if the number of descriptors pending are less than a cache line. Catherine fixes link status changes, where polling would only change link status changes in one direction depending on what the last old data saved off was. This was due to the watchdog only calling link_event and not handle_link_event. Mitch cleans up and enhances error messages related to VF MAC/VLAN filters. v2: Dropped patch "i40e: Properly cast type for arithmetic" patch based on feedback from the community ==================== Signed-off-by: David S. Miller --- 00cc3679187a5306e76fd21832ddfd7e5604b7c3