linux-next: manual merge of the hmm tree with the tip tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1421 bytes --]

Hi all,

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

  include/linux/ioport.h

between commit:

  ae9e13d621d6 ("x86/e820, ioport: Add a new I/O resource descriptor IORES_DESC_RESERVED")
  5da04cc86d12 ("x86/mm: Rework ioremap resource mapping determination")

from the tip tree and commit:

  25b2995a35b6 ("mm: remove MEMORY_DEVICE_PUBLIC support")

from the hmm 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 include/linux/ioport.h
index 5db386cfc2d4,a02b290ca08a..000000000000
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@@ -133,16 -132,6 +133,15 @@@ enum 
  	IORES_DESC_PERSISTENT_MEMORY		= 4,
  	IORES_DESC_PERSISTENT_MEMORY_LEGACY	= 5,
  	IORES_DESC_DEVICE_PRIVATE_MEMORY	= 6,
- 	IORES_DESC_DEVICE_PUBLIC_MEMORY		= 7,
- 	IORES_DESC_RESERVED			= 8,
++	IORES_DESC_RESERVED			= 7,
 +};
 +
 +/*
 + * Flags controlling ioremap() behavior.
 + */
 +enum {
 +	IORES_MAP_SYSTEM_RAM		= BIT(0),
 +	IORES_MAP_ENCRYPTED		= BIT(1),
  };
  
  /* helpers to define resources */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]