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] [day] [month] [year] [list]

Message-ID: <1560882.YLD57UpMaU@aspire.rjw.lan>
Date:   Fri, 12 Jan 2018 13:44:21 +0100
From:   "Rafael J. Wysocki" <rjw@...ysocki.net>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Wolfram Sang <wsa@...-dreams.de>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Phil Reid <preid@...ctromag.com.au>
Subject: Re: linux-next: manual merge of the pm tree with the i2c tree

On Friday, January 12, 2018 12:27:29 AM CET Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in:
> 
>   drivers/i2c/busses/i2c-designware-platdrv.c
> 
> between commit:
> 
>   0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to i2c_dw_prepare_clk")
> 
> from the i2c tree and commit:
> 
>   02e45646d53b ("PM: i2c-designware-platdrv: Optimize power management")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

The fix looks good to me.

Thanks!