* linux-next: manual merge of the mips tree with the at91 tree
@ 2026-02-02 13:18 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2026-02-02 13:18 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: Brian Masney, Claudiu Beznea, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-02-02 13:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-02 13:18 linux-next: manual merge of the mips tree with the at91 tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox