From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Jan 2009 16:19:42 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: firefly_0821_release~15876
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ccbf04f24c55ead791dac5df8ddeb1a640fbaad8;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/iser: Add dependency on INFINIBAND_ADDR_TRANS
  IPoIB: Do not join broadcast group if interface is brought down
  RDMA/nes: Fix for NIPQUAD removal
  IPoIB: Fix loss of connectivity after bonding failover on both sides
  IB/mlx4: Don't register IB device for adapters with no IB ports
  mlx4_core: Fix warning from min()
  IB/ehca: spin_lock_irqsave() takes an unsigned long
---

ccbf04f24c55ead791dac5df8ddeb1a640fbaad8