Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

Hi all,

On Wed, 10 Jun 2020 12:17:07 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
> 
>   drivers/scsi/sr.c
> 
> between commit:
> 
>   a711d91cd97e ("block: add a cdrom_device_info pointer to struct gendisk")
> 
> from Linus' tree and commit:
> 
>   6555781b3fde ("scsi: sr: Fix sr_probe() missing deallocate of device minor")
> 
> from the scsi-mkp tree.
> 

> diff --cc drivers/scsi/sr.c
> index 4dcd735ea49e,b9cff27e2c81..000000000000
> --- a/drivers/scsi/sr.c
> +++ b/drivers/scsi/sr.c
> @@@ -790,9 -790,10 +790,9 @@@ static int sr_probe(struct device *dev
>   	set_capacity(disk, cd->capacity);
>   	disk->private_data = &cd->driver;
>   	disk->queue = sdev->request_queue;
>  -	cd->cdi.disk = disk;
>   
>  -	if (register_cdrom(&cd->cdi))
>  +	if (register_cdrom(disk, &cd->cdi))
> - 		goto fail_put;
> + 		goto fail_minor;
>   
>   	/*
>   	 * Initialize block layer runtime PM stuffs before the

This is now a conflict between the scsi tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpL8tcSV6xna.pgp
Description: OpenPGP digital signature