From: Mark Brown <broonie@kernel•org>
To: Thomas Bogendoerfer <tsbogend@alpha•franken.de>
Cc: Brian Masney <bmasney@redhat•com>,
Claudiu Beznea <claudiu.beznea@tuxon•dev>,
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 mips tree with the at91 tree
Date: Mon, 2 Feb 2026 13:18:32 +0000 [thread overview]
Message-ID: <aYCkKJ4sW3wTbCJr@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1161 bytes --]
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
drivers/clk/microchip/clk-core.c
between commit:
69ccb0f338ea0 ("clk: microchip: core: remove unused include asm/traps.h")
from the at91 tree and commit:
07caa83edd9a9 ("clk: microchip: core: update include to use pic32.h from platform_data")
from the mips tree.
I fixed it up (see below) 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.
diff --cc drivers/clk/microchip/clk-core.c
index f467d7bc28c87,ce3a24e061d14..0000000000000
--- a/drivers/clk/microchip/clk-core.c
+++ b/drivers/clk/microchip/clk-core.c
@@@ -9,7 -9,8 +9,7 @@@
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/iopoll.h>
- #include <asm/mach-pic32/pic32.h>
+ #include <linux/platform_data/pic32.h>
-#include <asm/traps.h>
#include "clk-core.h"
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2026-02-02 13:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=aYCkKJ4sW3wTbCJr@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=bmasney@redhat$(echo .)com \
--cc=claudiu.beznea@tuxon$(echo .)dev \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tsbogend@alpha$(echo .)franken.de \
/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