Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Resolved kernel/bpf/btf.c using instructions from merge commit
69138b34a7
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -450,12 +450,13 @@ static int rds_still_queued(struct rds_sock *rs, struct rds_incoming *inc,
|
||||
int rds_notify_queue_get(struct rds_sock *rs, struct msghdr *msghdr)
|
||||
{
|
||||
struct rds_notifier *notifier;
|
||||
struct rds_rdma_notify cmsg = { 0 }; /* fill holes with zero */
|
||||
struct rds_rdma_notify cmsg;
|
||||
unsigned int count = 0, max_messages = ~0U;
|
||||
unsigned long flags;
|
||||
LIST_HEAD(copy);
|
||||
int err = 0;
|
||||
|
||||
memset(&cmsg, 0, sizeof(cmsg)); /* fill holes with zero */
|
||||
|
||||
/* put_cmsg copies to user space and thus may sleep. We can't do this
|
||||
* with rs_lock held, so first grab as many notifications as we can stuff
|
||||
|
Reference in New Issue
Block a user