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 S1752601AbcAFBo2 (ORCPT <rfc822;w@1wt.eu>);
	Tue, 5 Jan 2016 20:44:28 -0500
Received: from v094114.home.net.pl ([79.96.170.134]:47048 "HELO
	v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with SMTP id S1751978AbcAFBoX (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 5 Jan 2016 20:44:23 -0500
From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Wolfram Sang <wsa@the-dreams.de>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>,
        Loc Ho <lho@apm.com>
Subject: Re: linux-next: manual merge of the pm tree with the i2c tree
Date: Wed, 06 Jan 2016 03:15:04 +0100
Message-ID: <3075970.WbB6DJDsOa@vostro.rjw.lan>
User-Agent: KMail/4.11.5 (Linux/4.1.0-rc5+; KDE/4.11.5; x86_64; ; )
In-Reply-To: <20160106123911.2fff44b3@canb.auug.org.au>
References: <20160106123911.2fff44b3@canb.auug.org.au>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="utf-8"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wednesday, January 06, 2016 12:39:11 PM Stephen Rothwell wrote:
> Hi Rafael,

Hi,

> Today's linux-next merge of the pm tree got a conflict in:
> 
>   drivers/i2c/busses/i2c-designware-platdrv.c
> 
> between commit:
> 
>   90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C")
> 
> from the i2c tree and commit:
> 
>   a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device support")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me and thanks for taking care of this!

Rafael