linux-kernel - Re: linux-next: manual merge of the mfd tree with the mmc 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 for Android: free password hash cracker in your pocket

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

Message-ID: <Zo4oe536Yo14SlBT@shikoro>
Date: Wed, 10 Jul 2024 08:21:47 +0200
From: Wolfram Sang <wsa+renesas@...g-engineering.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Lee Jones <lee@...nel.org>, Ulf Hansson <ulf.hansson@...aro.org>,
	Geert Uytterhoeven <geert+renesas@...der.be>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the mfd tree with the mmc tree

On Wed, Jul 10, 2024 at 02:10:10PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   include/linux/mfd/tmio.h
> 
> between commits:
> 
>   89f415b99050 ("mfd: tmio: Remove obsolete .set_clk_div() callback")
>   f86937afb446 ("mmc: tmio: Remove obsolete .set_pwr() callback()")
> 
> from the mmc tree and commit:
> 
>   70b46487b155 ("mfd: tmio: Move header to platform_data")
> 
> from the mfd tree.
> 
> I fixed it up (I removed the file and applied the following patch) and

The fix looks good to me. Thank you!


Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)