From 89203dcc218cc06b453905954e666bc70879c7b1 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Sun, 5 Aug 2012 22:10:32 +0300 Subject: [PATCH] Refresh patches for linux-3.5 Signed-off-by: Vladimir Sokolovsky --- .../0001-ib_core-backport-dst_fetch_ha.patch | 4 ++-- ...02-ib-core-Backport-flowi4-and-flowi6.patch | 4 ++-- ...BACKPORT-core-netlink-for-kernels-3.4.patch | 4 ++-- ...re-Backport-pinned_vm-for-kernels-3.2.patch | 4 ++-- ...ackport-CLASS_ATTR-for-kernels-2.6.34.patch | 4 ++-- patches/0006-Backport-mlx4_ib.patch | 4 ++-- ...PORT-ucma-Revert-sysctl-registrations.patch | 4 ++-- ...MA-nes-Backports-for-RHEL-6.2-and-6.3.patch | 4 ++-- ...b4-Enable-header-file-inclusion-with-.patch | 6 +++--- ...-qib-backport-qib_fs.c-before-2.6.35.patch} | 11 ++++++++++- ...s-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch} | 10 +++++----- ...qib-backport-3.2-for-pinned_vm-field.patch} | 11 ++++++++++- ...-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch} | 10 +++++----- ...path-backport-qib_fs.c-before-2.6.35.patch} | 11 ++++++++++- ...ath-backport-3.2-for-pinned_vm-field.patch} | 11 ++++++++++- ...ts-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch} | 8 ++++---- ...ts-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch} | 8 ++++---- ...s-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch} | 6 +++--- ...s-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch} | 18 +++++++++--------- 19 files changed, 89 insertions(+), 53 deletions(-) rename patches/{0009-qib-fs-backport.patch => 0010-IB-qib-backport-qib_fs.c-before-2.6.35.patch} (86%) rename patches/{0010-cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch => 0011-cxgb3-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch} (98%) rename patches/{0010-qib-pinned-vm.patch => 0012-IB-qib-backport-3.2-for-pinned_vm-field.patch} (72%) rename patches/{0011-cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch => 0013-cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch} (98%) rename patches/{0011-ipath-fs-backport.patch => 0014-IB-ipath-backport-qib_fs.c-before-2.6.35.patch} (85%) rename patches/{0012-ipath-pinned-vm.patch => 0015-IB-ipath-backport-3.2-for-pinned_vm-field.patch} (78%) rename patches/{0012-iw_cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch => 0016-iw_cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch} (91%) rename patches/{0013-iw_cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch => 0017-iw_cxgb4-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch} (98%) rename patches/{0014-IPoIB-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch => 0018-IPoIB-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch} (98%) rename patches/{0019-mlx4_en-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch => 0019-mlx4_en-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch} (95%) diff --git a/patches/0001-ib_core-backport-dst_fetch_ha.patch b/patches/0001-ib_core-backport-dst_fetch_ha.patch index a835b3d..1c76365 100644 --- a/patches/0001-ib_core-backport-dst_fetch_ha.patch +++ b/patches/0001-ib_core-backport-dst_fetch_ha.patch @@ -1,7 +1,7 @@ -From 0bdb36768a4a4b5ed3984c671e76f29dbcc20ee6 Mon Sep 17 00:00:00 2001 +From 0038f903e7318e5e0ef15949acd78290b9c665a3 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Tue, 10 Jul 2012 15:57:24 +0300 -Subject: [PATCH 1/8] ib_core: backport dst_fetch_ha +Subject: [PATCH 01/19] ib_core: backport dst_fetch_ha Signed-off-by: Vladimir Sokolovsky --- diff --git a/patches/0002-ib-core-Backport-flowi4-and-flowi6.patch b/patches/0002-ib-core-Backport-flowi4-and-flowi6.patch index adfa992..7e72f81 100644 --- a/patches/0002-ib-core-Backport-flowi4-and-flowi6.patch +++ b/patches/0002-ib-core-Backport-flowi4-and-flowi6.patch @@ -1,7 +1,7 @@ -From bb3f1ecdb6baee2740a108b6df5710c7b69cd6f3 Mon Sep 17 00:00:00 2001 +From afcded5e038e760d131e231d5c4ef9b1aab47ef4 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Tue, 10 Jul 2012 17:21:25 +0300 -Subject: [PATCH 2/8] ib/core: Backport flowi4 and flowi6 +Subject: [PATCH 02/19] ib/core: Backport flowi4 and flowi6 Signed-off-by: Vladimir Sokolovsky --- diff --git a/patches/0003-BACKPORT-core-netlink-for-kernels-3.4.patch b/patches/0003-BACKPORT-core-netlink-for-kernels-3.4.patch index c764105..34da210 100644 --- a/patches/0003-BACKPORT-core-netlink-for-kernels-3.4.patch +++ b/patches/0003-BACKPORT-core-netlink-for-kernels-3.4.patch @@ -1,7 +1,7 @@ -From 99c4d483228edc17d03d7b4ee21c36943b4bcaca Mon Sep 17 00:00:00 2001 +From 7692a8ee4653116ca742acfbf84b008ef98a2fa2 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Mon, 25 Jun 2012 22:28:24 +0300 -Subject: [PATCH 3/8] BACKPORT: core/netlink for kernels <= 3.4 +Subject: [PATCH 03/19] BACKPORT: core/netlink for kernels <= 3.4 Signed-off-by: Vladimir Sokolovsky --- diff --git a/patches/0004-ib-core-Backport-pinned_vm-for-kernels-3.2.patch b/patches/0004-ib-core-Backport-pinned_vm-for-kernels-3.2.patch index 277cd15..c2d7eed 100644 --- a/patches/0004-ib-core-Backport-pinned_vm-for-kernels-3.2.patch +++ b/patches/0004-ib-core-Backport-pinned_vm-for-kernels-3.2.patch @@ -1,7 +1,7 @@ -From 812b253a1afb7e046ca7d60330692a4fcb1d0e84 Mon Sep 17 00:00:00 2001 +From 723354e9a6c86869c6bed9a2c7935551f494ca48 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Tue, 10 Jul 2012 17:41:31 +0300 -Subject: [PATCH 4/8] ib/core: Backport pinned_vm for kernels <= 3.2 +Subject: [PATCH 04/19] ib/core: Backport pinned_vm for kernels <= 3.2 Signed-off-by: Vladimir Sokolovsky --- diff --git a/patches/0005-ib-core-Backport-CLASS_ATTR-for-kernels-2.6.34.patch b/patches/0005-ib-core-Backport-CLASS_ATTR-for-kernels-2.6.34.patch index 1befd6c..edf420b 100644 --- a/patches/0005-ib-core-Backport-CLASS_ATTR-for-kernels-2.6.34.patch +++ b/patches/0005-ib-core-Backport-CLASS_ATTR-for-kernels-2.6.34.patch @@ -1,7 +1,7 @@ -From 12dcf9f472a1fc297b9909e84a4c7b2a82faeaa1 Mon Sep 17 00:00:00 2001 +From 83914b4f3d83330c6ad822f9452d4b2c81f328bd Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Tue, 10 Jul 2012 18:06:16 +0300 -Subject: [PATCH 5/8] ib/core: Backport CLASS_ATTR for kernels < 2.6.34 +Subject: [PATCH 05/19] ib/core: Backport CLASS_ATTR for kernels < 2.6.34 Signed-off-by: Vladimir Sokolovsky --- diff --git a/patches/0006-Backport-mlx4_ib.patch b/patches/0006-Backport-mlx4_ib.patch index ee0d2a1..ec0c93b 100644 --- a/patches/0006-Backport-mlx4_ib.patch +++ b/patches/0006-Backport-mlx4_ib.patch @@ -1,7 +1,7 @@ -From d7e2b00aaca04e9c1f976001189f8289117ff1ca Mon Sep 17 00:00:00 2001 +From 29b2e01be91deea5444b21c4345184c65e2126c5 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Thu, 12 Jul 2012 22:31:24 +0300 -Subject: [PATCH 6/8] Backport mlx4_ib +Subject: [PATCH 06/19] Backport mlx4_ib Signed-off-by: Vladimir Sokolovsky --- diff --git a/patches/0007-BACKPORT-ucma-Revert-sysctl-registrations.patch b/patches/0007-BACKPORT-ucma-Revert-sysctl-registrations.patch index c9ba19d..f5b1831 100644 --- a/patches/0007-BACKPORT-ucma-Revert-sysctl-registrations.patch +++ b/patches/0007-BACKPORT-ucma-Revert-sysctl-registrations.patch @@ -1,7 +1,7 @@ -From 74269c6e48ef212f4151a99ea9a0a0ce58427535 Mon Sep 17 00:00:00 2001 +From 2db8dcb3b0cde969104eefb7fd59f9d912d258b6 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Fri, 13 Jul 2012 00:24:56 +0300 -Subject: [PATCH 7/8] BACKPORT ucma: Revert sysctl registrations +Subject: [PATCH 07/19] BACKPORT ucma: Revert sysctl registrations Signed-off-by: Vladimir Sokolovsky --- diff --git a/patches/0008-RDMA-nes-Backports-for-RHEL-6.2-and-6.3.patch b/patches/0008-RDMA-nes-Backports-for-RHEL-6.2-and-6.3.patch index 1992493..bb2c448 100644 --- a/patches/0008-RDMA-nes-Backports-for-RHEL-6.2-and-6.3.patch +++ b/patches/0008-RDMA-nes-Backports-for-RHEL-6.2-and-6.3.patch @@ -1,7 +1,7 @@ -From 80aaf4b94ca74d3d0c661932ec05d46da4c42022 Mon Sep 17 00:00:00 2001 +From 5b576bba91da600067fb95cc76b13d57433b0767 Mon Sep 17 00:00:00 2001 From: Tatyana Nikolova Date: Mon, 16 Jul 2012 17:14:31 +0300 -Subject: [PATCH 8/8] RDMA/nes: Backports for RHEL 6.2 and 6.3 +Subject: [PATCH 08/19] RDMA/nes: Backports for RHEL 6.2 and 6.3 Backports for linux-3.5 nes to RHEL-6.2 and RHEL-6.3 diff --git a/patches/0009-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch b/patches/0009-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch index cd0b57e..3b9e8c2 100644 --- a/patches/0009-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch +++ b/patches/0009-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch @@ -1,7 +1,7 @@ -From b8ff2564c8451779f2892756c107f0a5f829342d Mon Sep 17 00:00:00 2001 +From bdb1401c1b46e21549c53f1681f6b7b03bb60ebc Mon Sep 17 00:00:00 2001 From: Vipul Pandya Date: Mon, 7 May 2012 12:43:41 +0530 -Subject: [PATCH] iw_cxgb3/iw_cxgb4: Enable header file inclusion with absolute path +Subject: [PATCH 09/19] iw_cxgb3/iw_cxgb4: Enable header file inclusion with absolute path iw_cxgb3/iw_cxgb4 driver includes header files of cxgb3/cxgb4 drivers respectively. OFED build environment is not able to find the header files @@ -24,7 +24,7 @@ index 2761364..c780a7a 100644 obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile -index 46b878c..b26d54c 100644 +index e11cf72..2f9fbf3 100644 --- a/drivers/infiniband/hw/cxgb4/Makefile +++ b/drivers/infiniband/hw/cxgb4/Makefile @@ -1,4 +1,4 @@ diff --git a/patches/0009-qib-fs-backport.patch b/patches/0010-IB-qib-backport-qib_fs.c-before-2.6.35.patch similarity index 86% rename from patches/0009-qib-fs-backport.patch rename to patches/0010-IB-qib-backport-qib_fs.c-before-2.6.35.patch index 517e99a..9a124d2 100644 --- a/patches/0009-qib-fs-backport.patch +++ b/patches/0010-IB-qib-backport-qib_fs.c-before-2.6.35.patch @@ -1,6 +1,12 @@ -IB/qib: backport qib_fs.c before 2.6.35 +From 62a485e26214924a1e2f4611460113c3f584038e Mon Sep 17 00:00:00 2001 +From: Mike Marciniszyn +Date: Thu, 2 Aug 2012 18:11:27 +0300 +Subject: [PATCH 10/19] IB/qib: backport qib_fs.c before 2.6.35 Signed-off-by: Mike Marciniszyn +--- + drivers/infiniband/hw/qib/qib_fs.c | 29 +++++++++++++++++++++++++++++ + 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c index 05e0f17..4ea3926 100644 @@ -80,3 +86,6 @@ index 05e0f17..4ea3926 100644 .kill_sb = qibfs_kill_super, }; +-- +1.7.0.4 + diff --git a/patches/0010-cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch b/patches/0011-cxgb3-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch similarity index 98% rename from patches/0010-cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch rename to patches/0011-cxgb3-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch index 0fe9490..22e936c 100644 --- a/patches/0010-cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch +++ b/patches/0011-cxgb3-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch @@ -1,7 +1,7 @@ -From 309e01c042f77e96dbd705178f43235ec6a23cbf Mon Sep 17 00:00:00 2001 +From 1e960f512bff5b850142ff281598bdca4333fae4 Mon Sep 17 00:00:00 2001 From: Vipul Pandya Date: Mon, 30 Jul 2012 19:08:37 +0530 -Subject: [PATCH] cxgb3: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 +Subject: [PATCH 11/19] cxgb3: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 Signed-off-by: Vipul Pandya --- @@ -79,7 +79,7 @@ index df01b63..9ef8b57 100644 unsigned int rspq_size; /* # of entries in response queue */ unsigned int fl_size; /* # of entries in regular free list */ diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c -index abb6ce7..a4c4f6a 100644 +index abb6ce7..f800119 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -643,6 +643,28 @@ static void enable_all_napi(struct adapter *adap) @@ -495,7 +495,7 @@ index 3fa3c88..4206b33 100644 goto done_rcu; diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c -index cfb60e1..2684f32 100644 +index cfb60e1..6be199f 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c @@ -2020,7 +2020,11 @@ static void rx_eth(struct adapter *adap, struct sge_rspq *rq, @@ -632,5 +632,5 @@ index 3af19a5..b3c99fd 100644 hash_lo |= (1 << hash); else -- -1.7.1 +1.7.0.4 diff --git a/patches/0010-qib-pinned-vm.patch b/patches/0012-IB-qib-backport-3.2-for-pinned_vm-field.patch similarity index 72% rename from patches/0010-qib-pinned-vm.patch rename to patches/0012-IB-qib-backport-3.2-for-pinned_vm-field.patch index ef850c2..34fbcc8 100644 --- a/patches/0010-qib-pinned-vm.patch +++ b/patches/0012-IB-qib-backport-3.2-for-pinned_vm-field.patch @@ -1,6 +1,12 @@ -IB/qib: backport < 3.2 for pinned_vm field +From 7996c9a696ae6954721ce66a8ab300c9df8b7f2e Mon Sep 17 00:00:00 2001 +From: Mike Marciniszyn +Date: Thu, 2 Aug 2012 18:11:27 +0300 +Subject: [PATCH 12/19] IB/qib: backport < 3.2 for pinned_vm field Signed-off-by: Mike Marciniszyn +--- + drivers/infiniband/hw/qib/qib_user_pages.c | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/infiniband/hw/qib/qib_user_pages.c b/drivers/infiniband/hw/qib/qib_user_pages.c index 2bc1d2b..80d6ea5 100644 @@ -30,3 +36,6 @@ index 2bc1d2b..80d6ea5 100644 up_write(¤t->mm->mmap_sem); } } +-- +1.7.0.4 + diff --git a/patches/0011-cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch b/patches/0013-cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch similarity index 98% rename from patches/0011-cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch rename to patches/0013-cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch index 2f5f8c5..5cfa4a2 100644 --- a/patches/0011-cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch +++ b/patches/0013-cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-SP2.patch @@ -1,7 +1,7 @@ -From 867d62561a8a95e35469b72b4c82589524e069b3 Mon Sep 17 00:00:00 2001 +From b316d1c7c58e9a499efd68a4072d7e566b50d733 Mon Sep 17 00:00:00 2001 From: Vipul Pandya Date: Mon, 30 Jul 2012 12:06:12 +0530 -Subject: [PATCH 1/4] cxgb4: Backports for RHEL6.2 RHEL 6.3 and SLES11 SP2 +Subject: [PATCH 13/19] cxgb4: Backports for RHEL6.2 RHEL 6.3 and SLES11 SP2 Signed-off-by: Vipul Pandya --- @@ -50,7 +50,7 @@ index ec2dafe..84fa932 100644 unsigned int nfrags; /* # of fragments */ unsigned int tot_len; /* total length of fragments */ diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c -index e1f96fb..12a0dba 100644 +index e1f96fb..ec57e1c 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -31,7 +31,9 @@ @@ -414,7 +414,7 @@ index e1f96fb..12a0dba 100644 netdev->netdev_ops = &cxgb4_netdev_ops; SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops); diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c -index e111d97..e25544f 100644 +index e111d97..b97bea7 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c @@ -216,8 +216,13 @@ static int map_skb(struct device *dev, const struct sk_buff *skb, @@ -594,5 +594,5 @@ index e111d97..e25544f 100644 restore_rx_bufs(&si, &rxq->fl, frags); } else if (likely(rsp_type == RSP_TYPE_CPL)) { -- -1.7.1 +1.7.0.4 diff --git a/patches/0011-ipath-fs-backport.patch b/patches/0014-IB-ipath-backport-qib_fs.c-before-2.6.35.patch similarity index 85% rename from patches/0011-ipath-fs-backport.patch rename to patches/0014-IB-ipath-backport-qib_fs.c-before-2.6.35.patch index 2945b73..273de3c 100644 --- a/patches/0011-ipath-fs-backport.patch +++ b/patches/0014-IB-ipath-backport-qib_fs.c-before-2.6.35.patch @@ -1,6 +1,12 @@ -IB/ipath: backport qib_fs.c before 2.6.35 +From 6de2e2a1dec734bab9788b2602edcbda1ce34cf2 Mon Sep 17 00:00:00 2001 +From: Mike Marciniszyn +Date: Thu, 2 Aug 2012 18:11:27 +0300 +Subject: [PATCH 14/19] IB/ipath: backport qib_fs.c before 2.6.35 Signed-off-by: Mike Marciniszyn +--- + drivers/infiniband/hw/ipath/ipath_fs.c | 26 ++++++++++++++++++++++++++ + 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index a4de9d5..5ec9c66 100644 @@ -74,3 +80,6 @@ index a4de9d5..5ec9c66 100644 .kill_sb = ipathfs_kill_super, }; +-- +1.7.0.4 + diff --git a/patches/0012-ipath-pinned-vm.patch b/patches/0015-IB-ipath-backport-3.2-for-pinned_vm-field.patch similarity index 78% rename from patches/0012-ipath-pinned-vm.patch rename to patches/0015-IB-ipath-backport-3.2-for-pinned_vm-field.patch index 17d62ee..d0db622 100644 --- a/patches/0012-ipath-pinned-vm.patch +++ b/patches/0015-IB-ipath-backport-3.2-for-pinned_vm-field.patch @@ -1,6 +1,12 @@ -IB/ipath: backport < 3.2 for pinned_vm field +From 4c438e025af2c1e3b6da2e80aa4cdeb22879b233 Mon Sep 17 00:00:00 2001 +From: Mike Marciniszyn +Date: Thu, 2 Aug 2012 18:11:27 +0300 +Subject: [PATCH 15/19] IB/ipath: backport < 3.2 for pinned_vm field Signed-off-by: Mike Marciniszyn +--- + drivers/infiniband/hw/ipath/ipath_user_pages.c | 12 ++++++++++++ + 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c index dc66c45..f2858e6 100644 @@ -42,3 +48,6 @@ index dc66c45..f2858e6 100644 up_write(&work->mm->mmap_sem); mmput(work->mm); kfree(work); +-- +1.7.0.4 + diff --git a/patches/0012-iw_cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch b/patches/0016-iw_cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch similarity index 91% rename from patches/0012-iw_cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch rename to patches/0016-iw_cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch index 249b410..424ff3c 100644 --- a/patches/0012-iw_cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch +++ b/patches/0016-iw_cxgb3-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch @@ -1,7 +1,7 @@ -From 822db87429e1fe56599a65ed355359362c4d5804 Mon Sep 17 00:00:00 2001 +From 6a037dd6124f663462974233e166febc4f743a4b Mon Sep 17 00:00:00 2001 From: Vipul Pandya Date: Mon, 30 Jul 2012 12:38:36 +0530 -Subject: [PATCH 3/4] iw_cxgb3: Backports for RHEL6.2 RHEL 6.3 and SLES11 SP2 +Subject: [PATCH 16/19] iw_cxgb3: Backports for RHEL6.2 RHEL 6.3 and SLES11 SP2 Signed-off-by: Vipul Pandya --- @@ -9,7 +9,7 @@ Signed-off-by: Vipul Pandya 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c -index 740dcc0..07bef67 100644 +index 740dcc0..c0b492f 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_cm.c +++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c @@ -338,12 +338,33 @@ static struct rtable *find_route(struct t3cdev *dev, __be32 local_ip, @@ -71,5 +71,5 @@ index 740dcc0..07bef67 100644 if (!ep->l2t) { printk(KERN_ERR MOD "%s - cannot alloc l2e.\n", __func__); -- -1.7.1 +1.7.0.4 diff --git a/patches/0013-iw_cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch b/patches/0017-iw_cxgb4-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch similarity index 98% rename from patches/0013-iw_cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch rename to patches/0017-iw_cxgb4-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch index 94b782c..60d1498 100644 --- a/patches/0013-iw_cxgb4-Backports-for-RHEL6.2-RHEL-6.3-and-SLES11-S.patch +++ b/patches/0017-iw_cxgb4-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch @@ -1,7 +1,7 @@ -From c359992f6044321a92bccf3bc1f69a4356a1782d Mon Sep 17 00:00:00 2001 +From 7042b9602eddcccd36c970f11d5123db52883b0c Mon Sep 17 00:00:00 2001 From: Vipul Pandya Date: Mon, 30 Jul 2012 16:59:42 +0530 -Subject: [PATCH] iw_cxgb4: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 +Subject: [PATCH 17/19] iw_cxgb4: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 Signed-off-by: Vipul Pandya --- @@ -112,7 +112,7 @@ index b18870c..c1805bd 100644 err = import_ep(ep, cm_id->remote_addr.sin_addr.s_addr, ep->dst, ep->com.dev, true); diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c -index 0f1607c..4046852 100644 +index 0f1607c..550eb82 100644 --- a/drivers/infiniband/hw/cxgb4/cq.c +++ b/drivers/infiniband/hw/cxgb4/cq.c @@ -70,7 +70,11 @@ static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq, @@ -289,5 +289,5 @@ index 16f26ab..cafdb7c 100644 void __iomem *gts; struct c4iw_rdev *rdev; -- -1.7.1 +1.7.0.4 diff --git a/patches/0014-IPoIB-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch b/patches/0018-IPoIB-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch similarity index 98% rename from patches/0014-IPoIB-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch rename to patches/0018-IPoIB-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch index 5cb54fa..55e06b6 100644 --- a/patches/0014-IPoIB-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch +++ b/patches/0018-IPoIB-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch @@ -1,7 +1,7 @@ -From c2ecb52764e5787acd7c0731b613dcfc8c101bfc Mon Sep 17 00:00:00 2001 +From fb296cd5f46e72878911b20e3e346b605ea84c4d Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Thu, 2 Aug 2012 16:12:39 +0300 -Subject: [PATCH] IPoIB: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 +Subject: [PATCH 18/19] IPoIB: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 Signed-off-by: Vladimir Sokolovsky --- @@ -202,5 +202,5 @@ index 20ebc6f..4a4c64a 100644 mcast = __ipoib_mcast_find(dev, &mgid); if (!mcast || test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) { -- -1.7.5.4 +1.7.0.4 diff --git a/patches/0019-mlx4_en-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch b/patches/0019-mlx4_en-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch similarity index 95% rename from patches/0019-mlx4_en-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch rename to patches/0019-mlx4_en-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch index 26430d8..428cc86 100644 --- a/patches/0019-mlx4_en-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP.patch +++ b/patches/0019-mlx4_en-Backports-for-RHEL6.2-RHEL6.3-and-SLES11-SP2.patch @@ -1,7 +1,7 @@ -From c1581892ecffb984628a4d44f93b267fe086974b Mon Sep 17 00:00:00 2001 +From 8d37aed4c921582f6cdacc00b1c9fbb933bfa9f1 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Sun, 5 Aug 2012 22:00:42 +0300 -Subject: [PATCH] mlx4_en: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 +Subject: [PATCH 19/19] mlx4_en: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2 Signed-off-by: Vladimir Sokolovsky --- @@ -44,7 +44,7 @@ index 72901ce..332e851 100644 diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c -index 926d8aa..ac66efe 100644 +index 073b85b..2a53952 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -45,6 +45,7 @@ @@ -89,7 +89,7 @@ index 926d8aa..ac66efe 100644 mlx4_en_clear_list(dev); priv->mc_addrs = mc_addrs; priv->mc_addrs_cnt = mc_addrs_cnt; -@@ -1040,6 +1051,7 @@ static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu) +@@ -1044,6 +1055,7 @@ static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu) return 0; } @@ -97,7 +97,7 @@ index 926d8aa..ac66efe 100644 static int mlx4_en_set_features(struct net_device *netdev, netdev_features_t features) { -@@ -1054,6 +1066,7 @@ static int mlx4_en_set_features(struct net_device *netdev, +@@ -1058,6 +1070,7 @@ static int mlx4_en_set_features(struct net_device *netdev, return 0; } @@ -105,7 +105,7 @@ index 926d8aa..ac66efe 100644 static const struct net_device_ops mlx4_netdev_ops = { .ndo_open = mlx4_en_open, -@@ -1071,8 +1084,10 @@ static const struct net_device_ops mlx4_netdev_ops = { +@@ -1075,8 +1088,10 @@ static const struct net_device_ops mlx4_netdev_ops = { #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = mlx4_en_netpoll, #endif @@ -116,7 +116,7 @@ index 926d8aa..ac66efe 100644 }; int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, -@@ -1178,6 +1193,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, +@@ -1182,6 +1197,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, /* * Set driver features */ @@ -124,7 +124,7 @@ index 926d8aa..ac66efe 100644 dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; if (mdev->LSO_support) dev->hw_features |= NETIF_F_TSO | NETIF_F_TSO6; -@@ -1189,6 +1205,19 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, +@@ -1193,6 +1209,19 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER; dev->hw_features |= NETIF_F_LOOPBACK; @@ -325,5 +325,5 @@ index 019d856..5a2bddd 100644 if (vlan_tx_tag_present(skb)) -- -1.5.4.3 +1.7.0.4 -- 2.41.0