On Thu, Jun 23, 2022 at 6:51 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the usb tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> f303c6b26ced ("MAINTAINERS: add spi to PolarFire SoC entry")
>
> from the spi tree and commit:
>
> 4a691b8c157a ("MAINTAINERS: add musb to PolarFire SoC entry")
>
> from the usb 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc MAINTAINERS
> index fcaa66ea848b,e73c77d479bb..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -17225,7 -17169,7 +17232,8 @@@ S: Supporte
> F: arch/riscv/boot/dts/microchip/
> F: drivers/mailbox/mailbox-mpfs.c
> F: drivers/soc/microchip/
> +F: drivers/spi/spi-microchip-core.c
> + F: drivers/usb/musb/mpfs.c
> F: include/soc/microchip/mpfs.h
Not that it would have avoided this conflict, but both commits didn't
care about sort order.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
