From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752035AbdLACOo (ORCPT ); Thu, 30 Nov 2017 21:14:44 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:45817 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751007AbdLACOn (ORCPT ); Thu, 30 Nov 2017 21:14:43 -0500 To: Stephen Rothwell Cc: "Martin K. Petersen" , Linux-Next Mailing List , Linux Kernel Mailing List , Ching Huang , Kees Cook Subject: Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree From: "Martin K. Petersen" Organization: Oracle Corporation References: <20171130125121.7d16ef43@canb.auug.org.au> <20171130125511.6313f7d3@canb.auug.org.au> Date: Thu, 30 Nov 2017 21:14:25 -0500 In-Reply-To: <20171130125511.6313f7d3@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 30 Nov 2017 12:55:11 +1100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen, > 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! Will fix things up tomorrow... -- Martin K. Petersen Oracle Linux Engineering