linux-next: manual merge of the fbdev tree with the drm tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

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

  drivers/video/fbdev/hitfb.c

between commit:

  bb47f218fd01 ("fbdev/hitfb: Cast I/O offset to address")

from the drm tree and commit:

  dadeeffbe525 ("fbdev: hitfb: Use NULL for pointers")

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/hitfb.c
index 7737923b7a0a,5f544a177033..000000000000
--- a/drivers/video/fbdev/hitfb.c
+++ b/drivers/video/fbdev/hitfb.c
@@@ -444,10 -428,10 +444,10 @@@ static int hitfb_suspend(struct device 
  {
  	u16 v;
  
- 	hitfb_blank(1,0);
+ 	hitfb_blank(1, NULL);
 -	v = fb_readw(HD64461_STBCR);
 +	v = hitfb_readw(HD64461_STBCR);
  	v |= HD64461_STBCR_SLCKE_IST;
 -	fb_writew(v, HD64461_STBCR);
 +	hitfb_writew(v, HD64461_STBCR);
  
  	return 0;
  }
@@@ -456,13 -440,13 +456,13 @@@ static int hitfb_resume(struct device *
  {
  	u16 v;
  
 -	v = fb_readw(HD64461_STBCR);
 +	v = hitfb_readw(HD64461_STBCR);
  	v &= ~HD64461_STBCR_SLCKE_OST;
  	msleep(100);
 -	v = fb_readw(HD64461_STBCR);
 +	v = hitfb_readw(HD64461_STBCR);
  	v &= ~HD64461_STBCR_SLCKE_IST;
 -	fb_writew(v, HD64461_STBCR);
 +	hitfb_writew(v, HD64461_STBCR);
- 	hitfb_blank(0,0);
+ 	hitfb_blank(0, NULL);
  
  	return 0;
  }

Attachment: pgpcB0eO49Edl.pgp
Description: OpenPGP digital signature