xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-next-early' into for-next

Browse Source 
The early for-next branch was based on v4.14-rc2, while the shared pull
request I got from Mellanox used a v4.14-rc4 base.  I'm making the
branch that was the shared Mellanox pull request the new for-next branch
and merging the early for-next branch into it.

Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Doug Ledford
2017-10-18 13:07:13 -04:00
parent e980b44134 4c532d6ce1
commit 754137a769
168 changed files with 10308 additions and 2891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/ulp/ipoib/ipoib_main.c
View File

@@ -51,7 +51,6 @@
#include <net/addrconf.h>
#include <linux/inetdevice.h>
#include <rdma/ib_cache.h>
#include <linux/pci.h>
#define DRV_VERSION "1.0.0"
@@ -2314,7 +2313,8 @@ static void ipoib_add_one(struct ib_device *device)
}
if (!count) {
kfree(dev_list);
pr_err("Failed to init port, removing it\n");
ipoib_remove_one(device, dev_list);
return;
}