From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the scsi tree with the block tree Date: Mon, 15 Apr 2019 15:59:39 +1000 Message-ID: <20190415155939.35325ef1@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/d1NnJ8l8lFK=6uQL4lNPhGb"; protocol="application/pgp-signature" Return-path: Sender: linux-kernel-owner@vger.kernel.org To: James Bottomley , Jens Axboe Cc: Linux Next Mailing List , Linux Kernel Mailing List , Bart Van Assche , "Martin K. Petersen" , Martin Wilck , Christoph Hellwig List-Id: linux-next.vger.kernel.org --Sig_/d1NnJ8l8lFK=6uQL4lNPhGb Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the scsi tree got a conflict in: drivers/scsi/sd.c between commit: c92e2f04b359 ("block: disk_events: introduce event flags") from the block tree and commit: 21e6ba3f0e02 ("scsi: sd: Rely on the driver core for asynchronous probing= ") d16ece577bf2 ("scsi: sd: Inline sd_probe_part2()") from the scsi 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/scsi/sd.c index ebc80354714c,e610b393809b..000000000000 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@@ -3404,8 -3374,49 +3342,50 @@@ static int sd_probe(struct device *dev get_device(dev); dev_set_drvdata(dev, sdkp); =20 - get_device(&sdkp->dev); /* prevent release before async_schedule */ - async_schedule_domain(sd_probe_async, sdkp, &scsi_sd_probe_domain); + gd->major =3D sd_major((index & 0xf0) >> 4); + gd->first_minor =3D ((index & 0xf) << 4) | (index & 0xfff00); +=20 + gd->fops =3D &sd_fops; + gd->private_data =3D &sdkp->driver; + gd->queue =3D sdkp->device->request_queue; +=20 + /* defaults, until the device tells us otherwise */ + sdp->sector_size =3D 512; + sdkp->capacity =3D 0; + sdkp->media_present =3D 1; + sdkp->write_prot =3D 0; + sdkp->cache_override =3D 0; + sdkp->WCE =3D 0; + sdkp->RCD =3D 0; + sdkp->ATO =3D 0; + sdkp->first_scan =3D 1; + sdkp->max_medium_access_timeouts =3D SD_MAX_MEDIUM_TIMEOUTS; +=20 + sd_revalidate_disk(gd); +=20 + gd->flags =3D GENHD_FL_EXT_DEVT; + if (sdp->removable) { + gd->flags |=3D GENHD_FL_REMOVABLE; + gd->events |=3D DISK_EVENT_MEDIA_CHANGE; ++ gd->event_flags =3D DISK_EVENT_FLAG_POLL | DISK_EVENT_FLAG_UEVENT; + } +=20 + blk_pm_runtime_init(sdp->request_queue, dev); + device_add_disk(dev, gd, NULL); + if (sdkp->capacity) + sd_dif_config_host(sdkp); +=20 + sd_revalidate_disk(gd); +=20 + if (sdkp->security) { + sdkp->opal_dev =3D init_opal_dev(sdp, &sd_sec_submit); + if (sdkp->opal_dev) + sd_printk(KERN_NOTICE, sdkp, "supports TCG Opal\n"); + } +=20 + sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", + sdp->removable ? "removable " : ""); + scsi_autopm_put_device(sdp); =20 return 0; =20 --Sig_/d1NnJ8l8lFK=6uQL4lNPhGb Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAly0HcsACgkQAVBC80lX 0GwbTQf+Jb5xUf5Ebg5uBgAKNEh0JT+CSlMUlVse1KhBLCjjdsmf5WfdDioIi1pw RzNS+dtHjhYjQr584aZA8gmWT/f8sBNbCYTN6UGmK1VjLaZ+GyTob/v3NNwvv5g0 DYSGAd38tYrJAmchuwX3i58+0nGo3LHK4hWAMc3KT8y5bkZLG/5dqh5nViWmKtnh pMBSAv8WymAkUOC4TWgpGYEBmINdC8x1iIMJbnnSdgj6kF6/ZjKA4QB0sy7P7ydF 8tdGnmBKIArlM3KTXAIF9gU2v+CBfYXOfIopA1EZAhk/QqZMSzrHp8YgI6lQjXdd mj6dhGkPDd6kFrypin6nErN/87w3Gw== =j269 -----END PGP SIGNATURE----- --Sig_/d1NnJ8l8lFK=6uQL4lNPhGb--