From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Leon Romanovsky <leon@kernel•org>,
David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Ahern <dsa@cumulusnetworks•com>
Subject: linux-next: manual merge of the rdma-leon-test tree with the net-next tree
Date: Tue, 8 Nov 2016 13:06:23 +1100 [thread overview]
Message-ID: <20161108130623.4b9b4403@canb.auug.org.au> (raw)
Hi Leon,
Today's linux-next merge of the rdma-leon-test tree got a conflict in:
drivers/infiniband/core/roce_gid_mgmt.c
between commit:
453d39329ad0 ("IB/core: Flip to the new dev walk API")
from the net-next tree and commit:
e4b4d6b5d8c2 ("IB/core: Remove debug prints after allocation failure")
from the rdma-leon-test tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/infiniband/core/roce_gid_mgmt.c
index 3a64a0881882,c86ddcea7675..000000000000
--- a/drivers/infiniband/core/roce_gid_mgmt.c
+++ b/drivers/infiniband/core/roce_gid_mgmt.c
@@@ -437,28 -434,6 +434,26 @@@ static void callback_for_addr_gid_devic
&parsed->gid_attr);
}
+struct upper_list {
+ struct list_head list;
+ struct net_device *upper;
+};
+
+static int netdev_upper_walk(struct net_device *upper, void *data)
+{
+ struct upper_list *entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
+ struct list_head *upper_list = data;
+
- if (!entry) {
- pr_info("roce_gid_mgmt: couldn't allocate entry to delete ndev\n");
++ if (!entry)
+ return 0;
- }
+
+ list_add_tail(&entry->list, upper_list);
+ dev_hold(upper);
+ entry->upper = upper;
+
+ return 0;
+}
+
static void handle_netdev_upper(struct ib_device *ib_dev, u8 port,
void *cookie,
void (*handle_netdev)(struct ib_device *ib_dev,
next reply other threads:[~2016-11-08 2:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-08 2:06 Stephen Rothwell [this message]
2016-11-08 8:39 ` linux-next: manual merge of the rdma-leon-test tree with the net-next tree Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161108130623.4b9b4403@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=dsa@cumulusnetworks$(echo .)com \
--cc=leon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox