Linux-Next Archive on
 help / color / Atom feed
From: Stephen Rothwell <>
To: Jason Gunthorpe <>, Doug Ledford <>
Cc: Linux Next Mailing List <>,
	Linux Kernel Mailing List <>,
	Erez Alfasi <>
Subject: linux-next: manual merge of the hmm tree with the rdma tree
Date: Tue, 5 Nov 2019 19:03:43 +1100
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1217 bytes --]

Hi all,

Today's linux-next merge of the hmm tree got a conflict in:


between commit:

  a3de94e3d61e ("IB/mlx5: Introduce ODP diagnostic counters")

from the rdma tree and commit:

  6bfc250a18a0 ("RDMA/odp: Use mmu_range_notifier_insert()")

from the hmm 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.

Stephen Rothwell

diff --cc drivers/infiniband/hw/mlx5/odp.c
index 45ee40c2f36e,f713eb82eeea..000000000000
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@@ -248,7 -251,8 +251,9 @@@ static bool mlx5_ib_invalidate_range(st
  	const u64 umr_block_mask = (MLX5_UMR_MTT_ALIGNMENT /
  				    sizeof(struct mlx5_mtt)) - 1;
  	u64 idx = 0, blk_start_idx = 0;
 +	u64 invalidations = 0;
+ 	unsigned long start;
+ 	unsigned long end;
  	int in_block = 0;
  	u64 addr;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

                 reply index

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publically 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on

Archives are clonable:
	git clone --mirror linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ \
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone