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 S1756244Ab0BBPXE (ORCPT <rfc822;w@1wt.eu>);
	Tue, 2 Feb 2010 10:23:04 -0500
Received: from kroah.org ([198.145.64.141]:58107 "EHLO coco.kroah.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1756216Ab0BBPXA (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 2 Feb 2010 10:23:00 -0500
Date: Tue, 2 Feb 2010 07:22:37 -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,
       Dominik Brodowski <linux@dominikbrodowski.net>,
       Thomas Gleixner <tglx@linutronix.de>
Subject: Re: linux-next: manual merge of the driver-core tree with the
	pcmcia tree
Message-ID: <20100202152237.GA15932@kroah.com>
References: <20100202170159.168a28e2.sfr@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20100202170159.168a28e2.sfr@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Feb 02, 2010 at 05:01:59PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/pcmcia/ds.c between commit
> 933a838aa1aae8388438bb002fbdaf6fca519a5c ("pcmcia: make use of
> pcmcia_dev_resume() return value") from the pcmcia tree and commit
> df5a0aec4591ae8a5deb67bc8cb6be3d0812abb2 ("drivers/base: Convert dev->sem
> to mutex") from the driver-core tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Fix looks fine, thanks for carrying it.

greg k-h