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 S1752388AbdATNXQ (ORCPT <rfc822;w@1wt.eu>);
        Fri, 20 Jan 2017 08:23:16 -0500
Received: from ozlabs.org ([103.22.144.67]:41627 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752088AbdATNXN (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 20 Jan 2017 08:23:13 -0500
Date: Sat, 21 Jan 2017 00:12:33 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ingo Molnar <mingo@kernel.org>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>,
        Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        "Martin K. Petersen" <martin.petersen@oracle.com>
Subject: Re: linux-next: manual merge of the scsi tree with the tip tree
Message-ID: <20170121001233.6699f1b3@canb.auug.org.au>
In-Reply-To: <20170120063552.GA14142@gmail.com>
References: <20170120142343.3d2e72af@canb.auug.org.au>
        <20170120063552.GA14142@gmail.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 Ingo,

On Fri, 20 Jan 2017 07:35:52 +0100 Ingo Molnar <mingo@kernel.org> 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