From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Lee Jones <lee@kernel•org>
Cc: Abinash Singh <abinashlalotra@gmail•com>,
Abinash Singh <abinashsinghlalotra@gmail•com>,
Arnd Bergmann <arnd@arndb•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the mfd tree with the mfd-fixes tree
Date: Fri, 20 Jun 2025 16:03:45 +1000 [thread overview]
Message-ID: <20250620160345.48fd2d50@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 738 bytes --]
Hi all,
Today's linux-next merge of the mfd tree got a conflict in:
drivers/mfd/twl4030-irq.c
between commit:
d9d79e4f7dc9 ("mfd: Fix building without CONFIG_OF")
from the mfd-fixes tree and commit:
3d77b3cc7cc8 ("mfd: twl4030-irq: Remove redundant 'node' variable")
from the mfd tree.
I fixed it up (I just used the former) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-06-20 6:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-20 6:03 Stephen Rothwell [this message]
[not found] ` <CAJZ91LDiQM2kSpmDM6TvnY5m8MEqK03fXJBWa=itxx5mdX1ifw@mail.gmail.com>
2025-06-25 9:10 ` linux-next: manual merge of the mfd tree with the mfd-fixes tree Lee Jones
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=20250620160345.48fd2d50@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=abinashlalotra@gmail$(echo .)com \
--cc=abinashsinghlalotra@gmail$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=lee@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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