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 S1755379AbbHQQDK (ORCPT <rfc822;w@1wt.eu>);
	Mon, 17 Aug 2015 12:03:10 -0400
Received: from out1-smtp.messagingengine.com ([66.111.4.25]:40012 "EHLO
	out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1752555AbbHQQDH (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 17 Aug 2015 12:03:07 -0400
X-Sasl-enc: QSwJTCVlce6T896cJkPBZW/U5lCCQNQLaXNKpUCJ8I5c 1439827386
Date: Mon, 17 Aug 2015 09:03:02 -0700
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Doug Ledford <dledford@redhat.com>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Christian Gromm <christian.gromm@microchip.com>,
        Steve Wise <swise@opengridcomputing.com>,
        Dennis Dalessandro <dennis.dalessandro@intel.com>
Subject: Re: linux-next: manual merge of the staging tree with the rdma tree
Message-ID: <20150817160302.GA6311@kroah.com>
References: <20150817181312.4be1a554@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150817181312.4be1a554@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 Mon, Aug 17, 2015 at 06:13:12PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in:
> 
>   drivers/staging/Kconfig
>   drivers/staging/Makefile
> 
> between commit:
> 
>   c2347d1b409d ("RDMA/amso1100: deprecate the amso1100 provider")
>   17465e48756f ("IB/ipath: Move ipath driver to staging.")
>   97748be1d6d0 ("Move hfi1 to staging")
> 
> from the rdma tree and commit:
> 
>   57562a72414c ("Staging: most: add MOST driver's core module")
> 
> from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h