From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752390AbdLADnD (ORCPT <rfc822;w@1wt.eu>);
        Thu, 30 Nov 2017 22:43:03 -0500
Received: from ozlabs.org ([103.22.144.67]:56479 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752320AbdLADnC (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 30 Nov 2017 22:43:02 -0500
Date: Fri, 1 Dec 2017 14:42:57 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Ching Huang <ching2048@areca.com.tw>,
        Kees Cook <keescook@chromium.org>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree
Message-ID: <20171201144257.212c88fc@canb.auug.org.au>
In-Reply-To: <yq1tvxb9ou6.fsf@oracle.com>
References: <20171130125121.7d16ef43@canb.auug.org.au>
        <20171130125511.6313f7d3@canb.auug.org.au>
        <yq1tvxb9ou6.fsf@oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Martin,

On Thu, 30 Nov 2017 21:14:25 -0500 "Martin K. Petersen" <martin.petersen@oracle.com> 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