Merge branch 'mad' into for-linus

Conflicts:
	drivers/infiniband/core/mad.c

diff --cc drivers/infiniband/core/mad.c
index 5cef8f87b96b90407a1df6935410117ece7a9a25,0f7da241fa05d28d7a367b946b4b12a8a682ad99..7522008fda86880f759128e694d9df0cda68c764
--- 1/drivers/infiniband/core/mad.c
--- 2/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@@ -2983,6 -2993,14 +2992,12 @@@ static int __init ib_mad_init_module(vo
  {
        int ret;
  
 -      spin_lock_init(&ib_mad_port_list_lock);
 -
+       mad_recvq_size = min(mad_recvq_size, IB_MAD_QP_MAX_SIZE);
+       mad_recvq_size = max(mad_recvq_size, IB_MAD_QP_MIN_SIZE);
+ 
+       mad_sendq_size = min(mad_sendq_size, IB_MAD_QP_MAX_SIZE);
+       mad_sendq_size = max(mad_sendq_size, IB_MAD_QP_MIN_SIZE);
+ 
        ib_mad_cache = kmem_cache_create("ib_mad",
                                         sizeof(struct ib_mad_private),
                                         0,