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 S1753665AbcKQCpF (ORCPT <rfc822;w@1wt.eu>);
        Wed, 16 Nov 2016 21:45:05 -0500
Received: from ozlabs.org ([103.22.144.67]:57203 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751953AbcKQCpE (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 16 Nov 2016 21:45:04 -0500
Date: Thu, 17 Nov 2016 13:44:59 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Jens Axboe <axboe@kernel.dk>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the block
 tree
Message-ID: <20161117134459.20d1d87d@canb.auug.org.au>
In-Reply-To: <yq1vavtkd03.fsf@sermon.lab.mkp.net>
References: <20161109135414.283a9ac5@canb.auug.org.au>
        <yq1vavtkd03.fsf@sermon.lab.mkp.net>
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 Fri, 11 Nov 2016 14:55:24 -0500 "Martin K. Petersen" <martin.petersen@oracle.com> wrote:
>
> In any case. It seems like the fact that the two SCSI trees may be out
> of sync could be an ongoing problem. So maybe you should just drop my
> tree again. I was just hoping to get visibility into potential merge
> problems sooner...

I'll keep it for now and see how it goes ...

-- 
Cheers,
Stephen Rothwell