linux-kernel - linux-next: manual merge of the risc-v tree with the mm-stable 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: <aXDNtx7iXjV-hsjm@sirena.org.uk>
Date: Wed, 21 Jan 2026 12:59:35 +0000
From: Mark Brown <broonie@...nel.org>
To: Palmer Dabbelt <palmer@...belt.com>, Paul Walmsley <paul@...an.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
	Ankur Arora <ankur.a.arora@...cle.com>,
	David Hildenbrand <david@...nel.org>,
	David Hildenbrand <david@...hat.com>,
	Florian Schmaus <florian.schmaus@...asip.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Paul Walmsley <pjw@...nel.org>
Subject: linux-next: manual merge of the risc-v tree with the mm-stable tree

Hi all,

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

  arch/riscv/include/asm/page.h

between commit:

  8e38607aa4aa8 ("treewide: provide a generic clear_user_page() variant")

from the mm-stable tree and commit:

  c3eb64f3dd69a ("riscv: mm: define copy_user_page() as copy_page()")

from the risc-v 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.

diff --cc arch/riscv/include/asm/page.h
index 061b60b954ecb,3c517bc9eac56..0000000000000
--- a/arch/riscv/include/asm/page.h
+++ b/arch/riscv/include/asm/page.h
@@@ -50,8 -50,8 +50,7 @@@ void clear_page(void *page)
  #endif
  #define copy_page(to, from)			memcpy((to), (from), PAGE_SIZE)
  
- #define copy_user_page(vto, vfrom, vaddr, topg) \
- 			memcpy((vto), (vfrom), PAGE_SIZE)
 -#define clear_user_page(pgaddr, vaddr, page)	clear_page(pgaddr)
+ #define copy_user_page(vto, vfrom, vaddr, topg) copy_page(vto, vfrom)
  
  /*
   * Use struct definitions to apply C type checking

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)