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

[Mark Brown]

Hi all,

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

  drivers/video/fbdev/ssd1307fb.c

between commit:

  d4488917e79c7 ("fbdev: defio: assert FBINFO_VIRTFB, drop VM_IO, add VM_MIXEDMAP")

from the mm tree and commit:

  81ae1f9a6c850 ("fbdev: ssd1307fb: check for fb_deferred_io_init() error")

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.

diff --cc drivers/video/fbdev/ssd1307fb.c
index db61d710fccb0,8fd96c37ee1ab..0000000000000
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@@ -767,9 -767,11 +767,13 @@@ static int ssd1307fb_probe(struct i2c_c
  	info->fix.smem_start = __pa(vmem);
  	info->fix.smem_len = vmem_size;
  
 +	info->flags = FBINFO_VIRTFB;
 +
- 	fb_deferred_io_init(info);
+ 	ret = fb_deferred_io_init(info);
+ 	if (ret) {
+ 		dev_err(dev, "failed to init fb deferred io: %d\n", ret);
+ 		goto fb_defio_error;
+ 	}
  
  	i2c_set_clientdata(client, info);

Attachment: signature.asc
Description: PGP signature