Subject: linux-next: manual merge of the mips tree with the at91 tree

From: Mark Brown <[email-masked]>
Date: Mon, 2 Feb 2026 13:18:32 +0000

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"