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 S1755634Ab2KMStF (ORCPT <rfc822;w@1wt.eu>);
	Tue, 13 Nov 2012 13:49:05 -0500
Received: from out5-smtp.messagingengine.com ([66.111.4.29]:51246 "EHLO
	out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1755615Ab2KMStA (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 13 Nov 2012 13:49:00 -0500
X-Sasl-enc: 9O/sMIaThv67oYFdgdIjknwfou4VzZTNlU6dvsBpJNoI 1352832539
Date: Tue, 13 Nov 2012 10:48:58 -0800
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        "Patil, Rachna" <rachna@ti.com>, Samuel Ortiz <sameo@linux.intel.com>,
        Jonathan Cameron <jic23@kernel.org>
Subject: Re: linux-next: manual merge of the staging tree with the mfd tree
Message-ID: <20121113184858.GB24793@kroah.com>
References: <20121113145043.031831301647d5e0a68807f0@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20121113145043.031831301647d5e0a68807f0@canb.auug.org.au>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Nov 13, 2012 at 02:50:43PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in
> drivers/iio/adc/Kconfig and drivers/iio/adc/Makefile between commit
> 5e53a69b44e8 ("IIO : ADC: tiadc: Add support of TI's ADC driver") from
> the mfd tree and commit 168c9d95a940 ("iio:adc:max1363 move from
> staging") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks fine to me, thanks.

greg k-h