Skip to contentSkip to conversation

please pull infiniband.git

GIT PULL Roland Dreier 1 participant 1 message Dec 2, 2010 InfiniBand

lore
Share & tools
lore
#0 lore raw

Linus, please pull from

master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus

This tree is also available from kernel.org mirrors at:

git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus

Just a few small things here:

- Fix a minor leak of a few bytes of kernel stack
- MAINTAINERS update
- Fix a few small issues introduced with the merge of IBoE support in 2.6.37-rc1

Chien Tung (1):
MAINTAINERS: Update NetEffect entry

Eli Cohen (4):
IB/mlx4: Fix memory ordering of VLAN insertion control bits
mlx4_core: Workaround firmware bug in query dev cap IB/mlx4: Fix IBoE reported link rate
IB/mlx4: Fix IBoE link state

Or Gerlitz (1):
IB/pack: Remove some unused code added by the IBoE patches

Roland Dreier (1):
Merge branches 'misc', 'mlx4' and 'nes' into for-next

Vasiliy Kulikov (1):
IB: Fix information leak in marshalling code

 MAINTAINERS                               |    3 +-
 drivers/infiniband/core/ud_header.c       |   30 -----------------------------
 drivers/infiniband/core/uverbs_marshall.c |    4 +++
 drivers/infiniband/hw/mlx4/main.c         |    4 +-
 drivers/infiniband/hw/mlx4/qp.c           |   10 ++++----
 drivers/net/mlx4/fw.c                     |    4 +++
 6 files changed, 16 insertions(+), 39 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html