Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

Hi Martin,

On Thu, 30 Nov 2017 21:14:25 -0500 "Martin K. Petersen" <martin.petersen@xxxxxxxxxx> wrote:
>
> > That should have been arcmsr_set_iop_datetime, sorry.  I will fix it
> > tomorrow if you haven't rebased onto v4.15-rc1 by then :-)  
> 
> I had such a huge pile of patches in the queue that I was compelled to
> begin 4.16 early. I had meant to rebase that tree to rc1 before
> switching my for-next branch over from 4.15 fixes. But I completely
> forgot when I pushed, sorry!

No worries.

> Will fix things up tomorrow...

Thanks.
-- 
Cheers,
Stephen Rothwell