From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Moritz Fischer <mdf@kernel•org>, Xu Yilun <yilun.xu@intel•com>,
Wu Hao <hao.wu@intel•com>,
Linus Torvalds <torvalds@linux-foundation•org>
Cc: Ivan Bornyakov <i.bornyakov@metrotek•ru>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the fpga-fixes tree with Linus' tree
Date: Fri, 12 May 2023 09:39:22 +1000 [thread overview]
Message-ID: <20230512093922.05dd8ba7@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2023-05-11 23:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230512093922.05dd8ba7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hao.wu@intel$(echo .)com \
--cc=i.bornyakov@metrotek$(echo .)ru \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mdf@kernel$(echo .)org \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=yilun.xu@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox