From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Lee Jones <lee@kernel.org>, Ulf Hansson <ulf.hansson@linaro.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the mfd tree with the mmc tree
Date: Wed, 10 Jul 2024 08:21:47 +0200 [thread overview]
Message-ID: <Zo4oe536Yo14SlBT@shikoro> (raw)
In-Reply-To: <20240710141010.4fbd65a0@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 600 bytes --]
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!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2024-07-10 6:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-10 4:10 linux-next: manual merge of the mfd tree with the mmc tree Stephen Rothwell
2024-07-10 6:21 ` Wolfram Sang [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-12-07 3:24 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zo4oe536Yo14SlBT@shikoro \
--to=wsa+renesas@sang-engineering.com \
--cc=geert+renesas@glider.be \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox