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

[Lorenzo Stoakes (ARM)]

On Tue, Oct 13, 2026 at 05:26:43PM +0100, Mark Brown wrote:
> 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")

Wow a conflict between two of my patches I have literally no excuses here :))

> 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);
>

LGTM thanks :)

--
Cheers, Lorenzo