linux-next: manual merge of the akpm-current tree with the rdma tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  include/linux/dynamic_debug.h

between commit:

  923abb9d797b ("RDMA/core: Introduce RDMA subsystem ibdev_* print functions")

from the rdma tree and commit:

  8dc1ed58157d ("lib/dynamic_debug.c: introduce CONFIG_DYNAMIC_DEBUG_RELATIVE_POINTERS")

from the akpm-current 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 include/linux/dynamic_debug.h
index 6c809440f319,08175c219d60..000000000000
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@@ -71,13 -77,12 +77,20 @@@ void __dynamic_netdev_dbg(struct _ddebu
  			  const struct net_device *dev,
  			  const char *fmt, ...);
  
 +struct ib_device;
 +
 +extern __printf(3, 4)
 +void __dynamic_ibdev_dbg(struct _ddebug *descriptor,
 +			 const struct ib_device *ibdev,
 +			 const char *fmt, ...);
 +
++
+ #ifdef CONFIG_DYNAMIC_DEBUG_RELATIVE_POINTERS
+ #include <asm/dynamic_debug.h>
+ #ifndef DEFINE_DYNAMIC_DEBUG_METADATA
+ # error "asm/dynamic_debug.h must provide definition of DEFINE_DYNAMIC_DEBUG_METADATA"
+ #endif
+ #else
  #define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt)		\
  	static struct _ddebug  __aligned(8)			\
  	__attribute__((section("__verbose"))) name = {		\

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