linux-kernel - Re: linux-next: manual merge of the pm tree with the i2c tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <3075970.WbB6DJDsOa@vostro.rjw.lan>
Date:	Wed, 06 Jan 2016 03:15:04 +0100
From:	"Rafael J. Wysocki" <rjw@...ysocki.net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Wolfram Sang <wsa@...-dreams.de>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Suravee Suthikulpanit <Suravee.Suthikulpanit@....com>,
	Loc Ho <lho@....com>
Subject: Re: linux-next: manual merge of the pm tree with the i2c tree

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/