From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@Huawei•com>,
Doug Ledford <dledford@redhat•com>,
Jason Gunthorpe <jgg@mellanox•com>
Cc: "Felipe Balbi (Intel)" <balbi@kernel•org>,
Jarkko Nikula <jarkko.nikula@linux•intel.com>,
Jason Gunthorpe <jgg@nvidia•com>, Jason Gunthorpe <jgg@ziepe•ca>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Raymond Tan <raymond.tan@intel•com>,
Shiraz Saleem <shiraz.saleem@intel•com>
Subject: linux-next: manual merge of the iio tree with the rdma tree
Date: Fri, 4 Jun 2021 14:57:02 +1000 [thread overview]
Message-ID: <20210604145702.37d3e56b@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2021-06-04 4:57 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=20210604145702.37d3e56b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jonathan.Cameron@Huawei$(echo .)com \
--cc=balbi@kernel$(echo .)org \
--cc=dledford@redhat$(echo .)com \
--cc=jarkko.nikula@linux$(echo .)intel.com \
--cc=jgg@mellanox$(echo .)com \
--cc=jgg@nvidia$(echo .)com \
--cc=jgg@ziepe$(echo .)ca \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=raymond.tan@intel$(echo .)com \
--cc=shiraz.saleem@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