]> www.infradead.org Git - users/jedix/linux-maple.git/commit
[patch1/3] Merge for Mellanox OFED R2, 0080 release
authorAjaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
Mon, 14 Jan 2013 05:21:22 +0000 (21:21 -0800)
committerAjaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
Mon, 14 Jan 2013 05:52:52 +0000 (21:52 -0800)
commitedc31ebe9e36d87dcd08931784a49c2e75eed359
treed845e4193ecebda40100127ad65018b9348e0e28
parentf7e7e855c9c38edb261ef05bfe4154b08cc2d652
[patch1/3] Merge for Mellanox OFED R2, 0080 release

Orabug: 15997083
Code files for following directories are copied from Mellanox OFED R2, 0080 release:
    drivers/infiniband/core
    drivers/infiniband/hw/mlx4
    drivers/infiniband/ulp/ipoib
    drivers/infiniband/ulp/sdp
    drivers/infiniband/ulp/iser
    drivers/infiniband/ulp/srp
    drivers/net/mlx4
    drivers/net/mlx4_vnic
    net/rds
    include/linux/mlx4
    include/rdma

Furthermore, this patch contains following:
- Kconfig and Makefile specific changes.
- Resolution of compilation errors arose due to this merge.

Signed-off-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
233 files changed:
drivers/infiniband/Kconfig
drivers/infiniband/Makefile
drivers/infiniband/core/Makefile
drivers/infiniband/core/addr.c
drivers/infiniband/core/agent.c
drivers/infiniband/core/cache.c
drivers/infiniband/core/cm.c
drivers/infiniband/core/cm_msgs.h
drivers/infiniband/core/cma.c
drivers/infiniband/core/core_priv.h
drivers/infiniband/core/device.c
drivers/infiniband/core/fmr_pool.c
drivers/infiniband/core/iwcm.c
drivers/infiniband/core/local_sa.c [new file with mode: 0644]
drivers/infiniband/core/mad.c
drivers/infiniband/core/mad_priv.h
drivers/infiniband/core/multicast.c
drivers/infiniband/core/notice.c [new file with mode: 0644]
drivers/infiniband/core/sa.h
drivers/infiniband/core/sa_query.c
drivers/infiniband/core/smi.c
drivers/infiniband/core/sysfs.c
drivers/infiniband/core/ucm.c
drivers/infiniband/core/ucma.c
drivers/infiniband/core/ud_header.c
drivers/infiniband/core/umem.c
drivers/infiniband/core/user_mad.c
drivers/infiniband/core/uverbs.h
drivers/infiniband/core/uverbs_cmd.c
drivers/infiniband/core/uverbs_main.c
drivers/infiniband/core/uverbs_marshall.c
drivers/infiniband/core/verbs.c
drivers/infiniband/hw/amso1100/c2_provider.c
drivers/infiniband/hw/cxgb3/iwch_provider.c
drivers/infiniband/hw/cxgb4/provider.c
drivers/infiniband/hw/ehca/ehca_main.c
drivers/infiniband/hw/ipath/ipath_verbs.c
drivers/infiniband/hw/mlx4/Makefile
drivers/infiniband/hw/mlx4/ah.c
drivers/infiniband/hw/mlx4/alias_GUID.c [new file with mode: 0644]
drivers/infiniband/hw/mlx4/alias_GUID.h [new file with mode: 0644]
drivers/infiniband/hw/mlx4/cm.c [new file with mode: 0644]
drivers/infiniband/hw/mlx4/cq.c
drivers/infiniband/hw/mlx4/ib_events.c [new file with mode: 0644]
drivers/infiniband/hw/mlx4/ib_events.h [new file with mode: 0644]
drivers/infiniband/hw/mlx4/mad.c
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/mlx4/mcg.c [new file with mode: 0644]
drivers/infiniband/hw/mlx4/mlx4_ib.h
drivers/infiniband/hw/mlx4/mr.c
drivers/infiniband/hw/mlx4/qp.c
drivers/infiniband/hw/mlx4/srq.c
drivers/infiniband/hw/mlx4/sysfs.c [new file with mode: 0644]
drivers/infiniband/hw/mlx4/wc.c [new file with mode: 0644]
drivers/infiniband/hw/mlx4/wc.h [new file with mode: 0644]
drivers/infiniband/hw/mthca/mthca_cmd.c
drivers/infiniband/hw/mthca/mthca_provider.c
drivers/infiniband/hw/nes/nes_verbs.c
drivers/infiniband/hw/qib/qib_verbs.c
drivers/infiniband/ulp/ipoib/ipoib.h
drivers/infiniband/ulp/ipoib/ipoib_cm.c
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
drivers/infiniband/ulp/ipoib/ipoib_fs.c
drivers/infiniband/ulp/ipoib/ipoib_ib.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/infiniband/ulp/ipoib/ipoib_multicast.c
drivers/infiniband/ulp/ipoib/ipoib_verbs.c
drivers/infiniband/ulp/ipoib/ipoib_vlan.c
drivers/infiniband/ulp/iser/iscsi_iser.c
drivers/infiniband/ulp/iser/iscsi_iser.h
drivers/infiniband/ulp/iser/iser_initiator.c
drivers/infiniband/ulp/iser/iser_memory.c
drivers/infiniband/ulp/iser/iser_verbs.c
drivers/infiniband/ulp/sdp/Kconfig [new file with mode: 0644]
drivers/infiniband/ulp/sdp/Makefile [new file with mode: 0644]
drivers/infiniband/ulp/sdp/sdp.h [new file with mode: 0644]
drivers/infiniband/ulp/sdp/sdp_bcopy.c [new file with mode: 0644]
drivers/infiniband/ulp/sdp/sdp_cma.c [new file with mode: 0644]
drivers/infiniband/ulp/sdp/sdp_dbg.h [new file with mode: 0644]
drivers/infiniband/ulp/sdp/sdp_main.c [new file with mode: 0644]
drivers/infiniband/ulp/sdp/sdp_proc.c [new file with mode: 0644]
drivers/infiniband/ulp/sdp/sdp_rx.c [new file with mode: 0644]
drivers/infiniband/ulp/sdp/sdp_tx.c [new file with mode: 0644]
drivers/infiniband/ulp/sdp/sdp_zcopy.c [new file with mode: 0644]
drivers/infiniband/ulp/srp/ib_srp.c
drivers/infiniband/ulp/srp/ib_srp.h
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/mlx4/Makefile
drivers/net/mlx4/alloc.c
drivers/net/mlx4/catas.c
drivers/net/mlx4/cmd.c
drivers/net/mlx4/cq.c
drivers/net/mlx4/en_cq.c
drivers/net/mlx4/en_ethtool.c
drivers/net/mlx4/en_frag.c [new file with mode: 0644]
drivers/net/mlx4/en_main.c
drivers/net/mlx4/en_netdev.c
drivers/net/mlx4/en_params.c [new file with mode: 0644]
drivers/net/mlx4/en_port.c
drivers/net/mlx4/en_port.h
drivers/net/mlx4/en_resources.c
drivers/net/mlx4/en_rx.c
drivers/net/mlx4/en_selftest.c
drivers/net/mlx4/en_tx.c
drivers/net/mlx4/eq.c
drivers/net/mlx4/fmr_api.h [new file with mode: 0644]
drivers/net/mlx4/fmr_master.c [new file with mode: 0644]
drivers/net/mlx4/fmr_master.h [new file with mode: 0644]
drivers/net/mlx4/fmr_slave.c [new file with mode: 0644]
drivers/net/mlx4/fmr_slave.h [new file with mode: 0644]
drivers/net/mlx4/fw.c
drivers/net/mlx4/fw.h
drivers/net/mlx4/icm.c
drivers/net/mlx4/icm.h
drivers/net/mlx4/intf.c
drivers/net/mlx4/main.c
drivers/net/mlx4/mcg.c
drivers/net/mlx4/mlx4.h
drivers/net/mlx4/mlx4_en.h
drivers/net/mlx4/mr.c
drivers/net/mlx4/pd.c
drivers/net/mlx4/pkey.c [new file with mode: 0644]
drivers/net/mlx4/port.c
drivers/net/mlx4/profile.c
drivers/net/mlx4/qp.c
drivers/net/mlx4/reset.c
drivers/net/mlx4/resource_tracker.c [new file with mode: 0644]
drivers/net/mlx4/rt_torture.c [new file with mode: 0644]
drivers/net/mlx4/sense.c
drivers/net/mlx4/srq.c
drivers/net/mlx4/xen_fmr.h [new file with mode: 0644]
drivers/net/mlx4/xen_fmr_master.c [new file with mode: 0644]
drivers/net/mlx4/xen_fmr_slave.c [new file with mode: 0644]
drivers/net/mlx4/xrcd.c [new file with mode: 0644]
drivers/net/mlx4_vnic/Makefile [new file with mode: 0644]
drivers/net/mlx4_vnic/fip_parser.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic.h [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_data.h [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_data_ethtool.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_data_fs.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_data_ib.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_data_mac.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_data_main.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_data_neigh.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_data_netdev.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_data_rx.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_data_tx.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_fip.h [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_fip_discover.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_fip_discover.h [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_fip_ib.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_fip_login.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_fip_main.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_fip_pkt.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_fip_pkt.h [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_fip_vhub.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_main.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_mcast.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_mcast.h [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_param.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_port.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_qp.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_stats_helper.c [new file with mode: 0644]
drivers/net/mlx4_vnic/vnic_utils.h [new file with mode: 0644]
include/linux/mlx4/cmd.h
include/linux/mlx4/device.h
include/linux/mlx4/driver.h
include/linux/mlx4/qp.h
include/linux/mlx4/srq.h
include/linux/rds.h
include/rdma/ib_addr.h
include/rdma/ib_cache.h
include/rdma/ib_cm.h
include/rdma/ib_fmr_pool.h
include/rdma/ib_mad.h
include/rdma/ib_pack.h
include/rdma/ib_pma.h [new file with mode: 0644]
include/rdma/ib_sa.h
include/rdma/ib_umem.h
include/rdma/ib_user_cm.h
include/rdma/ib_user_verbs.h
include/rdma/ib_verbs.h
include/rdma/iw_cm.h
include/rdma/rdma_cm.h
include/rdma/rdma_user_cm.h
include/rdma/sdp_socket.h [new file with mode: 0644]
net/9p/trans_rdma.c
net/rds/af_rds.c
net/rds/bind.c
net/rds/cong.c
net/rds/connection.c
net/rds/ib.c
net/rds/ib.h
net/rds/ib_cm.c
net/rds/ib_rdma.c
net/rds/ib_recv.c
net/rds/ib_ring.c
net/rds/ib_send.c
net/rds/ib_stats.c
net/rds/ib_sysctl.c
net/rds/info.c
net/rds/iw.c
net/rds/iw.h
net/rds/iw_cm.c
net/rds/iw_rdma.c
net/rds/iw_recv.c
net/rds/iw_ring.c
net/rds/iw_send.c
net/rds/iw_stats.c
net/rds/iw_sysctl.c
net/rds/loop.c
net/rds/message.c
net/rds/page.c
net/rds/rdma.c
net/rds/rdma_transport.c
net/rds/rdma_transport.h
net/rds/rds.h
net/rds/recv.c
net/rds/send.c
net/rds/stats.c
net/rds/sysctl.c
net/rds/tcp.c
net/rds/tcp.h
net/rds/tcp_connect.c
net/rds/tcp_listen.c
net/rds/tcp_recv.c
net/rds/tcp_send.c
net/rds/tcp_stats.c
net/rds/threads.c
net/rds/transport.c
net/sunrpc/xprtrdma/svc_rdma_transport.c
net/sunrpc/xprtrdma/verbs.c