linux-next: manual merge of the generic-ioremap tree with the risc-v tree

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

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

Hi all,

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

  arch/riscv/mm/Makefile

between commit:

  e9987a5b2ad3 ("riscv: add nommu support")

from the risc-v tree and commit:

  38af57825313 ("riscv: use the generic ioremap code")

from the generic-ioremap 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 arch/riscv/mm/Makefile
index 44ab8f28c3fa,b3a356c80c1f..000000000000
--- a/arch/riscv/mm/Makefile
+++ b/arch/riscv/mm/Makefile
@@@ -6,8 -6,8 +6,8 @@@ CFLAGS_REMOVE_init.o = -p
  endif
  
  obj-y += init.o
 -obj-y += fault.o
  obj-y += extable.o
- obj-$(CONFIG_MMU) += fault.o ioremap.o
++obj-$(CONFIG_MMU) += fault.o
  obj-y += cacheflush.o
  obj-y += context.o
  obj-y += sifive_l2_cache.o

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