From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Roland Dreier <roland@kernel•org>, linux-rdma@vger•kernel.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Al Viro <viro@ZenIV•linux.org.uk>,
"David S. Miller" <davem@davemloft•net>,
Haggai Eran <haggaie@mellanox•com>
Subject: linux-next: manual merge of the infiniband tree with Linus' tree
Date: Tue, 16 Dec 2014 12:41:23 +1100 [thread overview]
Message-ID: <20141216124123.14cdc5a4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 884 bytes --]
Hi all,
Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/hw/mlx5/mr.c between commit 479163f46082 ("mlx5:
don't duplicate kvfree()") from Linus' tree and commit 89c925949c1f
("IB/mlx5: Implement on demand paging by adding support for MMU
notifiers") from the infiniband tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/infiniband/hw/mlx5/mr.c
index 5a80dd993761,a2dd7bfc129b..000000000000
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@@ -856,7 -1009,8 +1012,8 @@@ static struct mlx5_ib_mr *reg_create(st
goto err_2;
}
mr->umem = umem;
+ mr->live = 1;
- mlx5_vfree(in);
+ kvfree(in);
mlx5_ib_dbg(dev, "mkey = 0x%x\n", mr->mmr.key);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-12-16 1:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-16 1:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-02-18 0:29 linux-next: manual merge of the infiniband tree with Linus' tree Stephen Rothwell
2014-10-15 0:46 Stephen Rothwell
2013-02-26 0:45 Stephen Rothwell
2013-02-26 7:27 ` Or Gerlitz
2013-02-22 0:50 Stephen Rothwell
2013-02-22 12:06 ` Or Gerlitz
2012-09-28 1:13 Stephen Rothwell
2012-07-09 2:04 Stephen Rothwell
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=20141216124123.14cdc5a4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=haggaie@mellanox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-rdma@vger$(echo .)kernel.org \
--cc=roland@kernel$(echo .)org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/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