linux-kernel - linux-next: manual merge of the usb tree with the spi tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220623134259.03af40f6@canb.auug.org.au>
Date:   Thu, 23 Jun 2022 13:42:59 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Mark Brown <broonie@...nel.org>
Cc:     Conor Dooley <conor.dooley@...rochip.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the usb tree with the spi tree

Hi all,

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
  
  RNBD BLOCK DRIVERS

Content of type "application/pgp-signature" skipped