LKML Archive on lore.kernel.org
 help / color / Atom feed
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:48:24 +1000
Message-ID: <20190506204824.11a7b368@canb.auug.org.au> (raw)


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

Hi all,

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

  lib/dynamic_debug.c

between commit:

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

from the rdma tree and commits:

  c20acb85ecb2 ("lib/dynamic_debug.c: introduce accessors for string members of struct _ddebug")
  686a19fd8999 ("lib/dynamic_debug.c: drop use of bitfields in struct _ddebug")
  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 lib/dynamic_debug.c
index 8a16c2d498e9,58288560cc35..000000000000
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@@ -37,8 -37,55 +37,57 @@@
  #include <linux/device.h>
  #include <linux/netdevice.h>
  
 +#include <rdma/ib_verbs.h>
 +
+ #ifdef CONFIG_DYNAMIC_DEBUG_RELATIVE_POINTERS
+ static inline const char *dd_modname(const struct _ddebug *dd)
+ {
+ 	return (const char *)dd + dd->modname_disp;
+ }
+ static inline const char *dd_function(const struct _ddebug *dd)
+ {
+ 	return (const char *)dd + dd->function_disp;
+ }
+ static inline const char *dd_filename(const struct _ddebug *dd)
+ {
+ 	return (const char *)dd + dd->filename_disp;
+ }
+ static inline const char *dd_format(const struct _ddebug *dd)
+ {
+ 	return (const char *)dd + dd->format_disp;
+ }
+ #else
+ static inline const char *dd_modname(const struct _ddebug *dd)
+ {
+ 	return dd->modname;
+ }
+ static inline const char *dd_function(const struct _ddebug *dd)
+ {
+ 	return dd->function;
+ }
+ static inline const char *dd_filename(const struct _ddebug *dd)
+ {
+ 	return dd->filename;
+ }
+ static inline const char *dd_format(const struct _ddebug *dd)
+ {
+ 	return dd->format;
+ }
+ #endif
+ 
+ static inline unsigned dd_lineno(const struct _ddebug *dd)
+ {
+ 	return dd->flags_lineno >> 8;
+ }
+ static inline unsigned dd_flags(const struct _ddebug *dd)
+ {
+ 	return dd->flags_lineno & 0xff;
+ }
+ static inline void dd_set_flags(struct _ddebug *dd, unsigned newflags)
+ {
+ 	dd->flags_lineno = (dd_lineno(dd) << 8) | newflags;
+ }
+ 
  extern struct _ddebug __start___verbose[];
  extern struct _ddebug __stop___verbose[];
  

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

             reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-06 10:48 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-05-09  5:38 Stephen Rothwell
2019-05-06 10:37 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=20190506204824.11a7b368@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

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git
	git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git
	git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org
	public-inbox-index lkml

Example config snippet for mirrors

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


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