From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Boris Brezillon <boris.brezillon@collabora.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Miquel Raynal <miquel.raynal@bootlin.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Subject: linux-next: manual merge of the pm tree with the i3c tree
Date: Wed, 17 Feb 2021 12:06:17 +1100 [thread overview]
Message-ID: <20210217120617.61b22e5e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1486 bytes --]
Hi all,
Today's linux-next merge of the pm tree got a conflict in:
MAINTAINERS
between commit:
f06a1af8e739 ("MAINTAINERS: Add Silvaco I3C master")
from the i3c tree and commit:
4590d98f5a4f ("sfi: Remove framework for deprecated firmware")
from the pm 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 fdb32f96ede9,f7ec274a3e5a..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -16221,21 -16235,6 +16218,14 @@@ S: Maintaine
F: Documentation/fb/sm712fb.rst
F: drivers/video/fbdev/sm712*
+SILVACO I3C DUAL-ROLE MASTER
+M: Miquel Raynal <miquel.raynal@bootlin.com>
+M: Conor Culhane <conor.culhane@silvaco.com>
+L: linux-i3c@lists.infradead.org
+S: Maintained
+F: Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
+F: drivers/i3c/master/svc-i3c-master.c
+
- SIMPLE FIRMWARE INTERFACE (SFI)
- S: Obsolete
- W: http://simplefirmware.org/
- F: arch/x86/platform/sfi/
- F: drivers/sfi/
- F: include/linux/sfi*.h
-
SIMPLEFB FB DRIVER
M: Hans de Goede <hdegoede@redhat.com>
L: linux-fbdev@vger.kernel.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-02-17 1:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 1:06 Stephen Rothwell [this message]
2021-02-17 9:59 ` linux-next: manual merge of the pm tree with the i3c tree Andy Shevchenko
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=20210217120617.61b22e5e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alexandre.belloni@bootlin.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=boris.brezillon@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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