Re: linux-next: manual merge of the scsi tree with the tip tree

2017-01-20 Thread Stephen Rothwell
Hi Ingo, On Fri, 20 Jan 2017 07:35:52 +0100 Ingo Molnar wrote: > > I only had that patch for testing and it went into the -next branch by > accident - > I have removed it so the conflict should be gone next time -next is > integrated. Thanks, these things happen. -- Cheers, Stephen Rothwell

Re: linux-next: manual merge of the scsi tree with the tip tree

2017-01-20 Thread James Bottomley
On Fri, 2017-01-20 at 07:35 +0100, Ingo Molnar wrote: > * Stephen Rothwell wrote: > > > Hi James, > > > > Today's linux-next merge of the scsi tree got a conflict in: > > > > drivers/scsi/mpt3sas/mpt3sas_scsih.c > > > > between commit: > > > > e963b7088dac ("scsi: mpt3sas: Fix hang on ata

Re: linux-next: manual merge of the scsi tree with the tip tree

2017-01-19 Thread Ingo Molnar
* Stephen Rothwell wrote: > Hi James, > > Today's linux-next merge of the scsi tree got a conflict in: > > drivers/scsi/mpt3sas/mpt3sas_scsih.c > > between commit: > > e963b7088dac ("scsi: mpt3sas: Fix hang on ata passthru commands") > > from the tip tree and commit: > > ffb584565894

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

2017-01-19 Thread Stephen Rothwell
Hi James, Today's linux-next merge of the scsi tree got a conflict in: drivers/scsi/mpt3sas/mpt3sas_scsih.c between commit: e963b7088dac ("scsi: mpt3sas: Fix hang on ata passthru commands") from the tip tree and commit: ffb584565894 ("scsi: mpt3sas: fix hang on ata passthrough commands"