From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Eduardo Valentin <edubezval@gmail.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Gal Pressman <galpress@amazon.com>,
Jason Gunthorpe <jgg@mellanox.com>,
Talel Shenhar <talel@amazon.com>
Subject: linux-next: manual merge of the thermal-soc tree with Linus' tree
Date: Mon, 13 May 2019 10:49:28 +1000 [thread overview]
Message-ID: <20190513104928.0265b40f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]
Hi all,
Today's linux-next merge of the thermal-soc tree got a conflict in:
MAINTAINERS
between commit:
f23afd75fc99 ("RDMA/efa: Add driver to Kconfig/Makefile")
from Linus' tree and commit:
7e34eb7dd067 ("thermal: Introduce Amazon's Annapurna Labs Thermal Driver")
from the thermal-soc 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 2ff031b5e620,7defe065470d..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -745,15 -744,12 +745,21 @@@ S: Supporte
F: Documentation/networking/device_drivers/amazon/ena.txt
F: drivers/net/ethernet/amazon/
+ AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
+ M: Talel Shenhar <talel@amazon.com>
+ S: Maintained
+ F: Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt
+ F: drivers/thermal/thermal_mmio.c
+
+AMAZON RDMA EFA DRIVER
+M: Gal Pressman <galpress@amazon.com>
+R: Yossi Leybovich <sleybo@amazon.com>
+L: linux-rdma@vger.kernel.org
+Q: https://patchwork.kernel.org/project/linux-rdma/list/
+S: Supported
+F: drivers/infiniband/hw/efa/
+F: include/uapi/rdma/efa-abi.h
+
AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
M: Tom Lendacky <thomas.lendacky@amd.com>
M: Gary Hook <gary.hook@amd.com>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-05-13 0:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-13 0:49 Stephen Rothwell [this message]
2019-05-14 3:44 ` linux-next: manual merge of the thermal-soc tree with Linus' tree Eduardo Valentin
2019-05-14 4:40 ` Stephen Rothwell
2019-05-14 14:15 ` Eduardo Valentin
2019-05-15 0:44 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-05-15 0:05 Stephen Rothwell
2017-10-30 16:42 Mark Brown
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=20190513104928.0265b40f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=edubezval@gmail.com \
--cc=galpress@amazon.com \
--cc=jgg@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=talel@amazon.com \
/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;
as well as URLs for NNTP newsgroup(s).