linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the scsi tree with Linus' tree
@ 2019-05-22  0:08 Stephen Rothwell
  2019-05-28  1:43 ` Stephen Rothwell
  0 siblings, 1 reply; 18+ messages in thread
From: Stephen Rothwell @ 2019-05-22  0:08 UTC (permalink / raw)
  To: James Bottomley
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Thomas Gleixner, Greg Kroah-Hartman, Christoph Hellwig,
	Martin K. Petersen, Hannes Reinecke

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

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

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

  drivers/scsi/hosts.c
  drivers/scsi/libsas/sas_task.c
  drivers/scsi/scsi.c
  drivers/scsi/scsi_error.c
  drivers/scsi/scsi_ioctl.c
  drivers/scsi/scsi_lib.c
  drivers/scsi/scsi_pm.c
  drivers/scsi/scsi_sysfs.c
  drivers/scsi/sd.c
  drivers/scsi/sr.c
  drivers/scsi/st.c

between commits:

  457c89965399 ("treewide: Add SPDX license identifier for missed files")
  09c434b8a004 ("treewide: Add SPDX license identifier for more missed files")

from Linus' tree and commits:

  026104bfa591 ("scsi: core: add SPDX tags to scsi midlayer files missing licensing information")
  5502239e73e6 ("scsi: libsas: add a SPDX tag to sas_task.c")
  5897b844b7f9 ("scsi: sd: add a SPDX tag to sd.c")
  95b04a2ff9c7 ("scsi: sr: add a SPDX tag to sr.c")
  50a1ea5bebbc ("scsi: st: add a SPDX tag to st.c")

from the scsi tree.

I fixed it up (I just used the scsi tree versions - which are GPL-2.0
instead of GPL-2.0-only) 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.



-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 18+ messages in thread
* linux-next: manual merge of the scsi tree with Linus' tree
@ 2019-05-22  0:11 Stephen Rothwell
  0 siblings, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2019-05-22  0:11 UTC (permalink / raw)
  To: James Bottomley
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Thomas Gleixner, Greg Kroah-Hartman, Hannes Reinece

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

Hi all,

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

  drivers/scsi/osst.c

between commit:

  09c434b8a004 ("treewide: Add SPDX license identifier for more missed files")

from Linus' tree and commit:

  70841904d909 ("scsi: osst: kill obsolete driver")

from the scsi tree.

I fixed it up (I just removed the file) 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.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 18+ messages in thread
* linux-next: manual merge of the scsi tree with Linus' tree
@ 2019-01-24  3:58 Stephen Rothwell
  0 siblings, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2019-01-24  3:58 UTC (permalink / raw)
  To: James Bottomley
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Luis Chamberlain, Christoph Hellwig, Ching Huang,
	Martin K. Petersen

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

Hi James,

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

  drivers/scsi/arcmsr/arcmsr_hba.c

between commit:

  750afb08ca71 ("cross-tree: phase out dma_zalloc_coherent()")

from Linus' tree and commit:

  3e3153b050fc ("scsi: arcmsr: Use dma_alloc_coherent to replace dma_zalloc_coherent")

from the scsi tree.

I fixed it up (I just used the scsi tree version) 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.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 18+ messages in thread
* linux-next: manual merge of the scsi tree with Linus' tree
@ 2019-01-14  2:48 Stephen Rothwell
  2019-01-14  5:42 ` 黃清隆
  0 siblings, 1 reply; 18+ messages in thread
From: Stephen Rothwell @ 2019-01-14  2:48 UTC (permalink / raw)
  To: James Bottomley
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Luis Chamberlain, Christoph Hellwig, Ching Huang,
	Martin K. Petersen

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

Hi all,

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

  drivers/scsi/arcmsr/arcmsr_hba.c

between commit:

  750afb08ca71 ("cross-tree: phase out dma_zalloc_coherent()")

from Linus' tree and commit:

  381d66da7212 ("scsi: arcmsr: Rename acb structure member roundup_ccbsize to ioqueue_size")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/arcmsr/arcmsr_hba.c
index 57c6fa388bf6,9f85d5abbb0c..000000000000
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@@ -585,12 -641,9 +641,11 @@@ static bool arcmsr_alloc_io_queue(struc
  
  	switch (acb->adapter_type) {
  	case ACB_ADAPTER_TYPE_B: {
- 		struct MessageUnit_B *reg;
- 		acb->roundup_ccbsize = roundup(sizeof(struct MessageUnit_B), 32);
+ 		acb->ioqueue_size = roundup(sizeof(struct MessageUnit_B), 32);
 -		dma_coherent = dma_zalloc_coherent(&pdev->dev, acb->ioqueue_size,
 -			&dma_coherent_handle, GFP_KERNEL);
 +		dma_coherent = dma_alloc_coherent(&pdev->dev,
- 						  acb->roundup_ccbsize,
++						  acb->ioqueue_size,
 +						  &dma_coherent_handle,
 +						  GFP_KERNEL);
  		if (!dma_coherent) {
  			pr_notice("arcmsr%d: DMA allocation failed\n", acb->host->host_no);
  			return false;
@@@ -616,13 -655,9 +657,11 @@@
  		}
  		break;
  	case ACB_ADAPTER_TYPE_D: {
- 		struct MessageUnit_D *reg;
- 
- 		acb->roundup_ccbsize = roundup(sizeof(struct MessageUnit_D), 32);
+ 		acb->ioqueue_size = roundup(sizeof(struct MessageUnit_D), 32);
 -		dma_coherent = dma_zalloc_coherent(&pdev->dev, acb->ioqueue_size,
 -			&dma_coherent_handle, GFP_KERNEL);
 +		dma_coherent = dma_alloc_coherent(&pdev->dev,
- 						  acb->roundup_ccbsize,
++						  acb->ioqueue_size,
 +						  &dma_coherent_handle,
 +						  GFP_KERNEL);
  		if (!dma_coherent) {
  			pr_notice("arcmsr%d: DMA allocation failed\n", acb->host->host_no);
  			return false;
@@@ -662,11 -671,9 +675,11 @@@
  	case ACB_ADAPTER_TYPE_E: {
  		uint32_t completeQ_size;
  		completeQ_size = sizeof(struct deliver_completeQ) * ARCMSR_MAX_HBE_DONEQUEUE + 128;
- 		acb->roundup_ccbsize = roundup(completeQ_size, 32);
+ 		acb->ioqueue_size = roundup(completeQ_size, 32);
 -		dma_coherent = dma_zalloc_coherent(&pdev->dev, acb->ioqueue_size,
 -			&dma_coherent_handle, GFP_KERNEL);
 +		dma_coherent = dma_alloc_coherent(&pdev->dev,
- 						  acb->roundup_ccbsize,
++						  acb->ioqueue_size,
 +						  &dma_coherent_handle,
 +						  GFP_KERNEL);
  		if (!dma_coherent){
  			pr_notice("arcmsr%d: DMA allocation failed\n", acb->host->host_no);
  			return false;

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

^ permalink raw reply	[flat|nested] 18+ messages in thread
* linux-next: manual merge of the scsi tree with Linus' tree
@ 2017-11-06  3:48 Stephen Rothwell
  0 siblings, 0 replies; 18+ messages in thread
From: Stephen Rothwell @ 2017-11-06  3:48 UTC (permalink / raw)
  To: James Bottomley
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Martin K. Petersen, Hannes Reinecke

Hi James,

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

  include/scsi/scsi_devinfo.h

between commit:

  28a0bc4120d3 ("scsi: sd: Implement blacklist option for WRITE SAME w/ UNMAP")

from Linus' tree and commit:

  f26aeada0493 ("scsi: scsi_devinfo: Reformat blacklist flags")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/scsi/scsi_devinfo.h
index 3575693bb628,7a2329c026a4..000000000000
--- a/include/scsi/scsi_devinfo.h
+++ b/include/scsi/scsi_devinfo.h
@@@ -4,32 -3,55 +4,57 @@@
  /*
   * Flags for SCSI devices that need special treatment
   */
- #define BLIST_NOLUN     	0x001	/* Only scan LUN 0 */
- #define BLIST_FORCELUN  	0x002	/* Known to have LUNs, force scanning,
- 					   deprecated: Use max_luns=N */
- #define BLIST_BORKEN    	0x004	/* Flag for broken handshaking */
- #define BLIST_KEY       	0x008	/* unlock by special command */
- #define BLIST_SINGLELUN 	0x010	/* Do not use LUNs in parallel */
- #define BLIST_NOTQ		0x020	/* Buggy Tagged Command Queuing */
- #define BLIST_SPARSELUN 	0x040	/* Non consecutive LUN numbering */
- #define BLIST_MAX5LUN		0x080	/* Avoid LUNS >= 5 */
- #define BLIST_ISROM     	0x100	/* Treat as (removable) CD-ROM */
- #define BLIST_LARGELUN		0x200	/* LUNs past 7 on a SCSI-2 device */
- #define BLIST_INQUIRY_36	0x400	/* override additional length field */
- #define BLIST_NOSTARTONADD	0x1000	/* do not do automatic start on add */
- #define BLIST_REPORTLUN2	0x20000	/* try REPORT_LUNS even for SCSI-2 devs
-  					   (if HBA supports more than 8 LUNs) */
- #define BLIST_NOREPORTLUN	0x40000	/* don't try REPORT_LUNS scan (SCSI-3 devs) */
- #define BLIST_NOT_LOCKABLE	0x80000	/* don't use PREVENT-ALLOW commands */
- #define BLIST_NO_ULD_ATTACH	0x100000 /* device is actually for RAID config */
- #define BLIST_SELECT_NO_ATN	0x200000 /* select without ATN */
- #define BLIST_RETRY_HWERROR	0x400000 /* retry HARDWARE_ERROR */
- #define BLIST_MAX_512		0x800000 /* maximum 512 sector cdb length */
- #define BLIST_NO_DIF		0x2000000 /* Disable T10 PI (DIF) */
- #define BLIST_SKIP_VPD_PAGES	0x4000000 /* Ignore SBC-3 VPD pages */
- #define BLIST_TRY_VPD_PAGES	0x10000000 /* Attempt to read VPD pages */
- #define BLIST_NO_RSOC		0x20000000 /* don't try to issue RSOC */
- #define BLIST_MAX_1024		0x40000000 /* maximum 1024 sector cdb length */
- #define BLIST_UNMAP_LIMIT_WS	0x80000000 /* Use UNMAP limit for WRITE SAME */
+ 
+ /* Only scan LUN 0 */
+ #define BLIST_NOLUN		((__force __u32 __bitwise)(1 << 0))
+ /* Known to have LUNs, force scanning.
+  * DEPRECATED: Use max_luns=N */
+ #define BLIST_FORCELUN		((__force __u32 __bitwise)(1 << 1))
+ /* Flag for broken handshaking */
+ #define BLIST_BORKEN		((__force __u32 __bitwise)(1 << 2))
+ /* unlock by special command */
+ #define BLIST_KEY		((__force __u32 __bitwise)(1 << 3))
+ /* Do not use LUNs in parallel */
+ #define BLIST_SINGLELUN		((__force __u32 __bitwise)(1 << 4))
+ /* Buggy Tagged Command Queuing */
+ #define BLIST_NOTQ		((__force __u32 __bitwise)(1 << 5))
+ /* Non consecutive LUN numbering */
+ #define BLIST_SPARSELUN		((__force __u32 __bitwise)(1 << 6))
+ /* Avoid LUNS >= 5 */
+ #define BLIST_MAX5LUN		((__force __u32 __bitwise)(1 << 7))
+ /* Treat as (removable) CD-ROM */
+ #define BLIST_ISROM		((__force __u32 __bitwise)(1 << 8))
+ /* LUNs past 7 on a SCSI-2 device */
+ #define BLIST_LARGELUN		((__force __u32 __bitwise)(1 << 9))
+ /* override additional length field */
+ #define BLIST_INQUIRY_36	((__force __u32 __bitwise)(1 << 10))
+ /* do not do automatic start on add */
+ #define BLIST_NOSTARTONADD	((__force __u32 __bitwise)(1 << 12))
+ /* try REPORT_LUNS even for SCSI-2 devs (if HBA supports more than 8 LUNs) */
+ #define BLIST_REPORTLUN2	((__force __u32 __bitwise)(1 << 17))
+ /* don't try REPORT_LUNS scan (SCSI-3 devs) */
+ #define BLIST_NOREPORTLUN	((__force __u32 __bitwise)(1 << 18))
+ /* don't use PREVENT-ALLOW commands */
+ #define BLIST_NOT_LOCKABLE	((__force __u32 __bitwise)(1 << 19))
+ /* device is actually for RAID config */
+ #define BLIST_NO_ULD_ATTACH	((__force __u32 __bitwise)(1 << 20))
+ /* select without ATN */
+ #define BLIST_SELECT_NO_ATN	((__force __u32 __bitwise)(1 << 21))
+ /* retry HARDWARE_ERROR */
+ #define BLIST_RETRY_HWERROR	((__force __u32 __bitwise)(1 << 22))
+ /* maximum 512 sector cdb length */
+ #define BLIST_MAX_512		((__force __u32 __bitwise)(1 << 23))
+ /* Disable T10 PI (DIF) */
+ #define BLIST_NO_DIF		((__force __u32 __bitwise)(1 << 25))
+ /* Ignore SBC-3 VPD pages */
+ #define BLIST_SKIP_VPD_PAGES	((__force __u32 __bitwise)(1 << 26))
+ /* Attempt to read VPD pages */
+ #define BLIST_TRY_VPD_PAGES	((__force __u32 __bitwise)(1 << 28))
+ /* don't try to issue RSOC */
+ #define BLIST_NO_RSOC		((__force __u32 __bitwise)(1 << 29))
+ /* maximum 1024 sector cdb length */
+ #define BLIST_MAX_1024		((__force __u32 __bitwise)(1 << 30))
++/* Use UNMAP limit for WRITE SAME */
++#define BLIST_UNMAP_LIMIT_WS	((__force __u32 __bitwise)(1 << 31))
  
  #endif

^ permalink raw reply	[flat|nested] 18+ messages in thread
[parent not found: <20140124130547.323ce38edc8dedfd653534b7@canb.auug.org.au>]
* linux-next: manual merge of the scsi tree with Linus' tree
@ 2012-07-20  0:32 Stephen Rothwell
  2012-07-20  7:29 ` James Bottomley
  0 siblings, 1 reply; 18+ messages in thread
From: Stephen Rothwell @ 2012-07-20  0:32 UTC (permalink / raw)
  To: James Bottomley; +Cc: linux-next, linux-kernel, Linus

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

Hi James,

Today's linux-next merge of the scsi tree got a conflict in
drivers/scsi/scsi_wait_scan.c between commit eea03c20ae38 ("Make
wait_for_device_probe() also do scsi_complete_async_scans()") from Linus'
tree and commit 01444e1106cb ("[SCSI] Remove scsi_wait_scan module") from
the scsi tree.

I just removed the file.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 18+ messages in thread
end of thread, other threads:[~2019-06-21  6:21 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-22  0:08 linux-next: manual merge of the scsi tree with Linus' tree Stephen Rothwell
2019-05-28  1:43 ` Stephen Rothwell
2019-06-20 23:59   ` Stephen Rothwell
2019-06-21  0:07     ` Linus Torvalds
2019-06-21  0:34       ` Martin K. Petersen
2019-06-21  0:35       ` James Bottomley
2019-06-21  0:47         ` Linus Torvalds
2019-06-21  1:14         ` Martin K. Petersen
2019-06-21  6:21           ` Greg Kroah-Hartman
  -- strict thread matches above, loose matches on Subject: below --
2019-05-22  0:11 Stephen Rothwell
2019-01-24  3:58 Stephen Rothwell
2019-01-14  2:48 Stephen Rothwell
2019-01-14  5:42 ` 黃清隆
2017-11-06  3:48 Stephen Rothwell
     [not found] <20140124130547.323ce38edc8dedfd653534b7@canb.auug.org.au>
2014-01-24  2:22 ` James Bottomley
2012-07-20  0:32 Stephen Rothwell
2012-07-20  7:29 ` James Bottomley
2012-07-20 16:31   ` Linus Torvalds

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).