linux-next: manual merge of the fbdev tree with Linus' tree

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

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

Hi all,

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

  drivers/video/fbdev/core/fbcon.c

between commits:

  d20a9f568f99 ("fbcon: Add an option to disable fbcon in panic")
  1c1ed27ee117 ("fbcon: Use oops_in_progress instead of panic_cpu")

from Linus' tree and commit:

  4baa6a5e164b ("fbcon: fbcon_is_inactive() -> fbcon_is_active()")

from the fbdev 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/video/fbdev/core/fbcon.c
index 2e093535884b,7e6be2a8850b..000000000000
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@@ -272,19 -267,7 +269,19 @@@ static int fbcon_get_rotate(struct fb_i
  	return (ops) ? ops->rotate : 0;
  }
  
 +static bool fbcon_skip_panic(struct fb_info *info)
 +{
 +/* panic_cpu is not exported, and can't be used if built as module. Use
 + * oops_in_progress instead, but non-fatal oops won't be printed.
 + */
 +#if defined(MODULE)
 +	return (info->skip_panic && unlikely(oops_in_progress));
 +#else
 +	return (info->skip_panic && unlikely(atomic_read(&panic_cpu) != PANIC_CPU_INVALID));
 +#endif
 +}
 +
- static inline int fbcon_is_inactive(struct vc_data *vc, struct fb_info *info)
+ static inline bool fbcon_is_active(struct vc_data *vc, struct fb_info *info)
  {
  	struct fbcon_ops *ops = info->fbcon_par;
  

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