* linux-next: manual merge of the iio tree with the rdma tree
@ 2021-06-04 4:57 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2021-06-04 4:57 UTC (permalink / raw)
To: Jonathan Cameron, Doug Ledford, Jason Gunthorpe
Cc: Felipe Balbi (Intel), Jarkko Nikula, Jason Gunthorpe,
Jason Gunthorpe, Linux Kernel Mailing List,
Linux Next Mailing List, Raymond Tan, Shiraz Saleem
[-- Attachment #1: Type: text/plain, Size: 1467 bytes --]
Hi all,
Today's linux-next merge of the iio tree got a conflict in:
MAINTAINERS
between commit:
fa0cf568fd76 ("RDMA/irdma: Add irdma Kconfig/Makefile and remove i40iw")
from the rdma tree and commit:
b711f687a1c1 ("counter: Add support for Intel Quadrature Encoder Peripheral")
from the iio 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 1caceb81cbb3,e679d422b472..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9420,6 -9364,19 +9420,11 @@@ L: linux-pm@vger•kernel.or
S: Supported
F: drivers/cpufreq/intel_pstate.c
+ INTEL QUADRATURE ENCODER PERIPHERAL DRIVER
+ M: Jarkko Nikula <jarkko.nikula@linux•intel.com>
+ L: linux-iio@vger•kernel.org
+ F: drivers/counter/intel-qep.c
+
-INTEL RDMA RNIC DRIVER
-M: Faisal Latif <faisal.latif@intel•com>
-M: Shiraz Saleem <shiraz.saleem@intel•com>
-L: linux-rdma@vger•kernel.org
-S: Supported
-F: drivers/infiniband/hw/i40iw/
-F: include/uapi/rdma/i40iw-abi.h
-
INTEL SCU DRIVERS
M: Mika Westerberg <mika.westerberg@linux•intel.com>
S: Maintained
[-- 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:[~2021-06-04 4:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-04 4:57 linux-next: manual merge of the iio tree with the rdma 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