* linux-next: manual merge of the fpga-fixes tree with Linus' tree
@ 2023-05-11 23:39 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2023-05-11 23:39 UTC (permalink / raw)
To: Moritz Fischer, Xu Yilun, Wu Hao, Linus Torvalds
Cc: Ivan Bornyakov, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1466 bytes --]
Hi all,
Today's linux-next merge of the fpga-fixes tree got a conflict in:
MAINTAINERS
between commit:
80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")
from Linus' tree and commit:
01b03f6266f4 ("MAINTAINERS: update Microchip MPF FPGA reviewers")
from the fpga-fixes 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 9120487cfcef,ba64194dc7df..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -13831,14 -13741,6 +13831,14 @@@ L: linux-serial@vger•kernel.or
S: Maintained
F: drivers/tty/serial/8250/8250_pci1xxxx.c
+MICROCHIP POLARFIRE FPGA DRIVERS
+M: Conor Dooley <conor.dooley@microchip•com>
- R: Ivan Bornyakov <i.bornyakov@metrotek•ru>
++R: Vladimir Georgiev <v.georgiev@metrotek•ru>
+L: linux-fpga@vger•kernel.org
+S: Supported
+F: Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml
+F: drivers/fpga/microchip-spi.c
+
MICROCHIP PWM DRIVER
M: Claudiu Beznea <claudiu.beznea@microchip•com>
L: linux-arm-kernel@lists•infradead.org (moderated for non-subscribers)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-11 23:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-11 23:39 linux-next: manual merge of the fpga-fixes tree with Linus' tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox