Linux-Next Archive on
 help / color / Atom feed
From: Stephen Rothwell <>
To: Chuck Lever <>,
	Doug Ledford <>,
	Jason Gunthorpe <>
Cc: Linux Next Mailing List <>,
	Linux Kernel Mailing List <>,
	Michal Kalderon <>,
	Ariel Elior <>
Subject: linux-next: manual merge of the cel tree with the rdma tree
Date: Tue, 5 Nov 2019 19:21:44 +1100
Message-ID: <> (raw)

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

Hi all,

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


between commit:

  771b46a8d15a ("RDMA/core: Move core content from ib_uverbs to ib_core")

from the rdma tree and commit:

  b0a70ca7e39e ("IB/core: Trace points for diagnosing completion queue issues")

from the cel 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/core/Makefile
index 9a8871e21545,68d9e27c3c61..000000000000
--- a/drivers/infiniband/core/Makefile
+++ b/drivers/infiniband/core/Makefile
@@@ -11,7 -11,7 +11,8 @@@ ib_core-y :=			packer.o ud_header.o ver
  				device.o fmr_pool.o cache.o netlink.o \
  				roce_gid_mgmt.o mr_pool.o addr.o sa_query.o \
  				multicast.o mad.o smi.o agent.o mad_rmpp.o \
- 				nldev.o restrack.o counters.o ib_core_uverbs.o
 -				nldev.o restrack.o counters.o trace.o
++				nldev.o restrack.o counters.o ib_core_uverbs.o \
++				trace.o
  ib_core-$(CONFIG_SECURITY_INFINIBAND) += security.o
  ib_core-$(CONFIG_CGROUP_RDMA) += cgroup.o

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

             reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-05  8:21 Stephen Rothwell [this message]
2019-11-05 13:03 ` Jason Gunthorpe

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