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 S1754037Ab2DWOYm (ORCPT <rfc822;w@1wt.eu>);
	Mon, 23 Apr 2012 10:24:42 -0400
Received: from out3-smtp.messagingengine.com ([66.111.4.27]:43701 "EHLO
	out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1751675Ab2DWOYl (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 23 Apr 2012 10:24:41 -0400
X-Sasl-enc: M8zDLpguAZWOU2zKdBYKEvpeUEqu9hOsRzYZGb2tfphf 1335191080
Date: Mon, 23 Apr 2012 07:24:39 -0700
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linus Walleij <linus.walleij@linaro.org>,
        =?iso-8859-1?Q?=22Sjur_Br=E6ndeland=22?= 
	<sjur.brandeland@stericsson.com>,
        linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        MyungJoo Ham <myungjoo.ham@samsung.com>
Subject: Re: linux-next: manual merge of the modem-shm tree with the
 driver-core tree
Message-ID: <20120423142439.GC32269@kroah.com>
References: <20120423154420.09f149266ae36bb8e08b4207@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20120423154420.09f149266ae36bb8e08b4207@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 Mon, Apr 23, 2012 at 03:44:20PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the modem-shm tree got a conflict in
> drivers/Kconfig between commit de55d8716ac5  ("Extcon (external
> connector): import Android's switch class and modify") from the
> driver-core tree and commit 021fd6178bcd ("modem_shm: Makefile and
> Kconfig for M7400 Shared Memory Drivers") from the modem-shm tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Looks good, thanks for doing this.

greg k-h