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 S1753255AbbHMPeo (ORCPT <rfc822;w@1wt.eu>);
	Thu, 13 Aug 2015 11:34:44 -0400
Received: from out3-smtp.messagingengine.com ([66.111.4.27]:54746 "EHLO
	out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1752901AbbHMPeg (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 13 Aug 2015 11:34:36 -0400
X-Sasl-enc: PGweavU76idSHfdOHde/VjbhrH0FwUpkciIV8cxCgkEy 1439480075
Date: Thu, 13 Aug 2015 08:34:33 -0700
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: 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, "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: Re: linux-next: manual merge of the staging tree with the tip tree
Message-ID: <20150813153433.GA1749@kroah.com>
References: <20150813145535.6db96f9f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150813145535.6db96f9f@canb.auug.org.au>
User-Agent: Mutt/1.5.23+102 (2ca89bed6448) (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Aug 13, 2015 at 02:55:35PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/ozwpan/ozproto.c
> 
> between commit:
> 
>   5a447f09a8df ("staging: ozwpan: Fix hrtimer wreckage")
> 
> from the tip tree and commit:
> 
>   a73e99cb67e7 ("staging: ozwpan: Remove from tree")
> 
> from the staging tree.
> 
> I fixed it up (I just removed the file) and can carry the fix as necessary
> (no action is required).

Sounds good to me, thanks.

greg k-h