linux-next: manual merge of the cel tree with the rdma tree

[Stephen Rothwell]

Hi all,

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

  drivers/infiniband/core/Makefile

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.

-- 
Cheers,
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: pgptKmaa4dICY.pgp
Description: OpenPGP digital signature