linux-next: manual merge of the drivers-x86 tree with the pm tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drivers-x86 tree got a conflict in:

  MAINTAINERS

between commit:

  895519c19fae ("MAINTAINERS: Add additional file to uncore frequency control")

from the pm tree and commit:

  ce2645c458b5 ("platform/x86/intel/uncore-freq: Move to uncore-frequency folder")

from the drivers-x86 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 cc2b69c7bb58,a419a6938786..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9957,8 -9918,7 +9972,8 @@@ INTEL UNCORE FREQUENCY CONTRO
  M:	Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
  L:	platform-driver-x86@xxxxxxxxxxxxxxx
  S:	Maintained
 +F:	Documentation/admin-guide/pm/intel_uncore_frequency_scaling.rst
- F:	drivers/platform/x86/intel/uncore-frequency.c
+ F:	drivers/platform/x86/intel/uncore-frequency/
  
  INTEL VENDOR SPECIFIC EXTENDED CAPABILITIES DRIVER
  M:	David E. Box <david.e.box@xxxxxxxxxxxxxxx>

Attachment: pgpY3504A7ruu.pgp
Description: OpenPGP digital signature