linux-next: manual merge of the scsi tree with the block tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2863 bytes --]

Hi all,

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

  Documentation/scsi/scsi_mid_low_api.txt

between commit:

  a10183d744fb ("scsi: simplify scsi_partsize")

from the block tree and commit:

  ce5c5d6503c9 ("scsi: docs: convert scsi_mid_low_api.txt to ReST")

from the scsi tree.

I fixed it up (I deleted that file and added the following merge fix
patch) 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 25 Mar 2020 16:00:39 +1100
Subject: [PATCH] scsi: fix up for "scsi: simplify scsi_partsize"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Documentation/scsi/scsi_mid_low_api.rst | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/Documentation/scsi/scsi_mid_low_api.rst b/Documentation/scsi/scsi_mid_low_api.rst
index 37ee63b147e9..5358bc10689e 100644
--- a/Documentation/scsi/scsi_mid_low_api.rst
+++ b/Documentation/scsi/scsi_mid_low_api.rst
@@ -308,7 +308,6 @@ Summary:
   - scsi_host_alloc - return a new scsi_host instance whose refcount==1
   - scsi_host_get - increments Scsi_Host instance's refcount
   - scsi_host_put - decrements Scsi_Host instance's refcount (free if 0)
-  - scsi_partsize - parse partition table into cylinders, heads + sectors
   - scsi_register - create and register a scsi host adapter instance.
   - scsi_remove_device - detach and remove a SCSI device
   - scsi_remove_host - detach and remove all SCSI devices owned by host
@@ -481,26 +480,6 @@ Details::
     void scsi_host_put(struct Scsi_Host *shost)
 
 
-    /**
-    * scsi_partsize - parse partition table into cylinders, heads + sectors
-    * @buf: pointer to partition table
-    * @capacity: size of (total) disk in 512 byte sectors
-    * @cyls: outputs number of cylinders calculated via this pointer
-    * @hds: outputs number of heads calculated via this pointer
-    * @secs: outputs number of sectors calculated via this pointer
-    *
-    *      Returns 0 on success, -1 on failure
-    *
-    *      Might block: no
-    *
-    *      Notes: Caller owns memory returned (free with kfree() )
-    *
-    *      Defined in: drivers/scsi/scsicam.c
-    **/
-    int scsi_partsize(unsigned char *buf, unsigned long capacity,
-		    unsigned int *cyls, unsigned int *hds, unsigned int *secs)
-
-
     /**
     * scsi_register - create and register a scsi host adapter instance.
     * @sht:        pointer to scsi host template
-- 
2.25.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]