From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@mellanox.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Gal Pressman <galpress@amazon.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>
Subject: linux-next: manual merge of the akpm-current tree with the rdma tree
Date: Mon, 6 May 2019 20:37:10 +1000 [thread overview]
Message-ID: <20190506203710.10b080dc@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2019-05-06 10:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-06 10:37 Stephen Rothwell [this message]
2019-05-06 10:48 linux-next: manual merge of the akpm-current tree with the rdma tree Stephen Rothwell
2019-05-09 5:38 Stephen Rothwell
Reply instructions:
You may reply publicly 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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190506203710.10b080dc@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=dledford@redhat.com \
--cc=galpress@amazon.com \
--cc=jgg@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).