Subject: linux-next: manual merge of the drm-intel tree with the drm tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 7 Sep 2016 13:59:26 +1000

Hi all,

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

  include/drm/drmP.h

between commit:

  c4e68a583202 ("drm: Introduce DRM_DEV_* log messages")

from the drm tree and commit:

  30b0da8d556e ("drm: extra printk() wrapper macros")

from the drm-intel 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.

I just did a minimal fixup, and more work consolidating these changes
could probably be done.

-- 
Cheers,
Stephen Rothwell

diff --cc include/drm/drmP.h
index 94eb138753a9,734e4fb11f52..000000000000
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@@ -194,26 -205,8 +214,23 @@@ void drm_printk(const char *level, unsi
  				      DEFAULT_RATELIMIT_BURST);		\
  									\
  	if (__ratelimit(&_rs))						\
 -		drm_err(fmt, ##__VA_ARGS__);				\
 +		DRM_DEV_ERROR(dev, fmt, ##__VA_ARGS__);			\
 +})
 +#define DRM_ERROR_RATELIMITED(fmt, ...)					\
 +	DRM_DEV_ERROR_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
 +
 +#define DRM_DEV_INFO(dev, fmt, ...)					\
 +	drm_dev_printk(dev, KERN_INFO, DRM_UT_NONE, __func__, "", fmt,	\
 +		       ##__VA_ARGS__)
- #define DRM_INFO(fmt, ...)						\
- 	drm_printk(KERN_INFO, DRM_UT_NONE, __func__, "", fmt, ##__VA_ARGS__)
 +
 +#define DRM_DEV_INFO_ONCE(dev, fmt, ...)				\
 +({									\
 +	static bool __print_once __read_mostly;				\
 +	if (!__print_once) {						\
 +		__print_once = true;					\
 +		DRM_DEV_INFO(dev, fmt, ##__VA_ARGS__);			\
 +	}								\
  })
- #define DRM_INFO_ONCE(fmt, ...) DRM_DEV_INFO_ONCE(NULL, fmt, ##__VA_ARGS__)
  
  /**
   * Debug output.