Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the hmm tree with the rdma tree
@ 2019-11-05  8:03 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-11-05  8:03 UTC (permalink / raw)
  To: Jason Gunthorpe, Doug Ledford
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Erez Alfasi

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

Hi all,

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

  drivers/infiniband/hw/mlx5/odp.c

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.

-- 
Cheers,
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 --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-05  8:03 linux-next: manual merge of the hmm tree with the rdma tree Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 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/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git