linux-next: manual merge of the iio tree with the rdma tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxx
  S:	Supported
  F:	drivers/cpufreq/intel_pstate.c
  
+ INTEL QUADRATURE ENCODER PERIPHERAL DRIVER
+ M:	Jarkko Nikula <jarkko.nikula@xxxxxxxxxxxxxxx>
+ L:	linux-iio@xxxxxxxxxxxxxxx
+ F:	drivers/counter/intel-qep.c
+ 
 -INTEL RDMA RNIC DRIVER
 -M:	Faisal Latif <faisal.latif@xxxxxxxxx>
 -M:	Shiraz Saleem <shiraz.saleem@xxxxxxxxx>
 -L:	linux-rdma@xxxxxxxxxxxxxxx
 -S:	Supported
 -F:	drivers/infiniband/hw/i40iw/
 -F:	include/uapi/rdma/i40iw-abi.h
 -
  INTEL SCU DRIVERS
  M:	Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
  S:	Maintained

Attachment: pgpsATyrmpVhQ.pgp
Description: OpenPGP digital signature