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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20191118173014.654c20f6@canb.auug.org.au>
Date:   Mon, 18 Nov 2019 17:30:14 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Christoph Hellwig <hch@....de>,
        Palmer Dabbelt <palmer@...belt.com>,
        Paul Walmsley <paul@...an.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: manual merge of the generic-ioremap tree with the
 risc-v tree

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

Content of type "application/pgp-signature" skipped