Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 12 Jul 2021 09:02:12 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Ulf Hansson <ulf.hansson@linaro.org>
Cc:     Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Stephen Boyd <swboyd@chromium.org>
Subject: Re: linux-next: manual merge of the block tree with the mmc-fixes
 tree
Message-ID: <20210712090212.79b40e20@canb.auug.org.au>
In-Reply-To: <20210709103244.64b2f1de@canb.auug.org.au>
References: <20210709103244.64b2f1de@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/YGDPu_VDs0wa2cS810Owr9Z";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/YGDPu_VDs0wa2cS810Owr9Z
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 9 Jul 2021 10:32:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Today's linux-next merge of the block tree got a conflict in:
>=20
>   drivers/mmc/core/block.c
>=20
> between commit:
>=20
>   5c0777665b3e ("mmc: core: Use kref in place of struct mmc_blk_data::usa=
ge")
>=20
> from the mmc-fixes tree and commits:
>=20
>   249cda3325e0 ("mmc: remove an extra blk_{get,put}_queue pair")
>   607d968a5769 ("mmc: switch to blk_mq_alloc_disk")
>=20
> from the block tree.
>=20
> 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.
>=20
> diff --cc drivers/mmc/core/block.c
> index d7b5c5ab75fa,9890a1532cb0..000000000000
> --- a/drivers/mmc/core/block.c
> +++ b/drivers/mmc/core/block.c
> @@@ -195,26 -196,18 +195,25 @@@ static inline int mmc_get_devidx(struc
>   	return devidx;
>   }
>  =20
>  -static void mmc_blk_put(struct mmc_blk_data *md)
>  +static void mmc_blk_kref_release(struct kref *ref)
>   {
>  -	mutex_lock(&open_lock);
>  -	md->usage--;
>  -	if (md->usage =3D=3D 0) {
>  -		int devidx =3D mmc_get_devidx(md->disk);
>  +	struct mmc_blk_data *md =3D container_of(ref, struct mmc_blk_data, kre=
f);
>  +	int devidx;
>  =20
>  -		ida_simple_remove(&mmc_blk_ida, devidx);
>  -		put_disk(md->disk);
>  -		kfree(md);
>  -	}
>  +	devidx =3D mmc_get_devidx(md->disk);
> - 	blk_put_queue(md->queue.queue);
>  +	ida_simple_remove(&mmc_blk_ida, devidx);
>  +
>  +	mutex_lock(&open_lock);
>  +	md->disk->private_data =3D NULL;
>   	mutex_unlock(&open_lock);
>  +
>  +	put_disk(md->disk);
>  +	kfree(md);
>  +}
>  +
>  +static void mmc_blk_put(struct mmc_blk_data *md)
>  +{
>  +	kref_put(&md->kref, mmc_blk_kref_release);
>   }
>  =20
>   static ssize_t power_ro_lock_show(struct device *dev,
> @@@ -2334,27 -2327,11 +2333,11 @@@ static struct mmc_blk_data *mmc_blk_all
>  =20
>   	INIT_LIST_HEAD(&md->part);
>   	INIT_LIST_HEAD(&md->rpmbs);
>  -	md->usage =3D 1;
>  +	kref_init(&md->kref);
> -=20
> - 	ret =3D mmc_init_queue(&md->queue, card);
> - 	if (ret)
> - 		goto err_putdisk;
> -=20
>   	md->queue.blkdata =3D md;
>  =20
> - 	/*
> - 	 * Keep an extra reference to the queue so that we can shutdown the
> - 	 * queue (i.e. call blk_cleanup_queue()) while there are still
> - 	 * references to the 'md'. The corresponding blk_put_queue() is in
> - 	 * mmc_blk_put().
> - 	 */
> - 	if (!blk_get_queue(md->queue.queue)) {
> - 		mmc_cleanup_queue(&md->queue);
> - 		ret =3D -ENODEV;
> - 		goto err_putdisk;
> - 	}
> -=20
>   	md->disk->major	=3D MMC_BLOCK_MAJOR;
> + 	md->disk->minors =3D perdev_minors;
>   	md->disk->first_minor =3D devidx * perdev_minors;
>   	md->disk->fops =3D &mmc_bdops;
>   	md->disk->private_data =3D md;

This is now a conflict between the mmc-fixes tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/YGDPu_VDs0wa2cS810Owr9Z
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmDreHQACgkQAVBC80lX
0GwSjQf+PZPzITEqXzgq3VCzd/nB6Bn4E+TpKfmM334f+TS3t/pJsQhIrFzbQKhy
dGf11ESdzgmS90q3XyGIC5v/30zM/mxvyHFAG2xI34Fl7tC2GJBmagMaCFeltA/1
HWL5xBkh5m8L73VS5S6ThQAxYjIPSun0FwBn1VnK9O9t43a1CXZKrmFwYwia6SmW
tipY9tZCAjPyJ8xmxajoXV4nZN/GiERgJYQcHazIZMFdNNrrx2tBiyiPssTij4MH
boWvWkVsGLnWsO8HCpzrhWe5NNzHsmb9v8Oc8qcZ6vy3twc0bvSdXQ9Czcz0Trg8
8YmhfraVzy3BHUdff2d81Vi7yYbfkg==
=7X9Q
-----END PGP SIGNATURE-----

--Sig_/YGDPu_VDs0wa2cS810Owr9Z--