Merge branch 'master' into next

Conflicts:
	security/keys/internal.h
	security/keys/process_keys.c
	security/keys/request_key.c

Fixed conflicts above by using the non 'tsk' versions.

Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 430d430bce29..d07e3f148951 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -7204,10 +7204,13 @@ static void
 poll_bnx2(struct net_device *dev)
 {
         struct bnx2 *bp = netdev_priv(dev);
+        int i;
 
-        disable_irq(bp->pdev->irq);
-        bnx2_interrupt(bp->pdev->irq, dev);
-        enable_irq(bp->pdev->irq);
+        for (i = 0; i < bp->irq_nvecs; i++) {
+                disable_irq(bp->irq_tbl[i].vector);
+                bnx2_interrupt(bp->irq_tbl[i].vector, &bp->bnx2_napi[i]);
+                enable_irq(bp->irq_tbl[i].vector);
+        }
 }
 #endif