summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-12-05 17:39:31 -0500
committerDavid S. Miller <davem@davemloft.net>2015-12-05 17:39:31 -0500
commitf61e2eebc7c572723cef1742bc7e99ac6cffe192 (patch)
tree3c0b9258068d08ea0ec63c20be17cbbd3cfa7cd0 /MAINTAINERS
parentf2a3771ae8aca879c32336c76ad05a017629bae2 (diff)
parent8ddb33268902c80ecd9a0e1bc766a2dc4bc9fede (diff)
downloadlinux-stable-f61e2eebc7c572723cef1742bc7e99ac6cffe192.tar.gz
linux-stable-f61e2eebc7c572723cef1742bc7e99ac6cffe192.tar.bz2
linux-stable-f61e2eebc7c572723cef1742bc7e99ac6cffe192.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue
Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2015-12-03 This series contains updates to ixgbe, i40e/i40evf, MAINTAINERS and e100.txt Alex provides a fix for ixgbe where enabling SR-IOV and then bringing the interface up was resulting in the PF MAC addresses getting into a bad state. The workaround for this issue is to bring up the interface first and then enable SR-IOV as this will trigger the reset in the existing code. I clean up legacy license stuff in the e100.txt documentation and then update the maintainers/reviewers list for our drivers. Jesse fixes an issue with the i40e/i40evf drivers, where if the driver were to happen to have a mutex held while the i40e_init_adminq() call was called, the init_adminq might inadvertently call mutex_init on a lock that was held which is a violation of the calling semantices. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 51927005edbf..f1cf47cf767f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5577,7 +5577,7 @@ R: Jesse Brandeburg <jesse.brandeburg@intel.com>
R: Shannon Nelson <shannon.nelson@intel.com>
R: Carolyn Wyborny <carolyn.wyborny@intel.com>
R: Don Skidmore <donald.c.skidmore@intel.com>
-R: Matthew Vick <matthew.vick@intel.com>
+R: Bruce Allan <bruce.w.allan@intel.com>
R: John Ronciak <john.ronciak@intel.com>
R: Mitch Williams <mitch.a.williams@intel.com>
L: intel-wired-lan@lists.osuosl.org