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 S1752521AbbG2Ho2 (ORCPT <rfc822;w@1wt.eu>);
	Wed, 29 Jul 2015 03:44:28 -0400
Received: from mail-wi0-f180.google.com ([209.85.212.180]:34950 "EHLO
	mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750860AbbG2Ho0 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 29 Jul 2015 03:44:26 -0400
Date: Wed, 29 Jul 2015 08:44:19 +0100
From: Lee Jones <lee.jones@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Mika Westerberg <mika.westerberg@linux.intel.com>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: Re: linux-next: manual merge of the mfd tree with the pm tree
Message-ID: <20150729074419.GG2284@x1>
References: <20150729122730.1fc9b6a6@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20150729122730.1fc9b6a6@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

> Hi Lee,

Morning Stephen.

> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   drivers/acpi/scan.c
> 
> between commit:
> 
>   68c6b148daa6 ("ACPI / scan: Move device matching code to bus.c")
> 
> from the pm tree and commit:
> 
>   712e960f0ee9 ("ACPI / PM: Attach ACPI power domain only once")
> 
> from the mfd tree.

I believe this will go away when Rafael pulls [0]

[0] http://www.kernelhub.org/?msg=803290&p=2

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog