linux-next: manual merge of the risc-v tree with the mm-stable tree

linux-next: manual merge of the risc-v tree with the mm-stable tree

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/include/asm/hwcap.h

between commit:

  59f6acb4be02 ("riscv: add RISC-V Svrsw60t59b extension support")

from the mm-stable tree and commits:

  c9651fbc6051 ("riscv: Add ISA extension parsing for Zalasr")
  ac3b03f8a4eb ("riscv: add ISA extension parsing for Zilsd and Zclsd")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/include/asm/hwcap.h
index f98fcb5c17d5,bfba183e6290..000000000000
--- a/arch/riscv/include/asm/hwcap.h
+++ b/arch/riscv/include/asm/hwcap.h
@@@ -106,7 -106,9 +106,10 @@@
  #define RISCV_ISA_EXT_ZAAMO		97
  #define RISCV_ISA_EXT_ZALRSC		98
  #define RISCV_ISA_EXT_ZICBOP		99
- #define RISCV_ISA_EXT_SVRSW60T59B	100
+ #define RISCV_ISA_EXT_ZALASR		100
+ #define RISCV_ISA_EXT_ZILSD		101
+ #define RISCV_ISA_EXT_ZCLSD		102
++#define RISCV_ISA_EXT_SVRSW60T59B	103
  
  #define RISCV_ISA_EXT_XLINUXENVCFG	127
  

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

linux-next: manual merge of the risc-v tree with the mm-stable tree

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/include/asm/hwcap.h

between commit:

  59f6acb4be02 ("riscv: add RISC-V Svrsw60t59b extension support")

from the mm-stable tree and commits:

  c9651fbc6051 ("riscv: Add ISA extension parsing for Zalasr")
  144ed7bda8b9 ("riscv: add ISA extension parsing for Zilsd and Zclsd")
  55a811a7f304 ("riscv: zicfiss / zicfilp enumeration")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/include/asm/hwcap.h
index f98fcb5c17d5,ce2ed4460c37..000000000000
--- a/arch/riscv/include/asm/hwcap.h
+++ b/arch/riscv/include/asm/hwcap.h
@@@ -106,7 -106,11 +106,12 @@@
  #define RISCV_ISA_EXT_ZAAMO		97
  #define RISCV_ISA_EXT_ZALRSC		98
  #define RISCV_ISA_EXT_ZICBOP		99
- #define RISCV_ISA_EXT_SVRSW60T59B	100
+ #define RISCV_ISA_EXT_ZALASR		100
+ #define RISCV_ISA_EXT_ZILSD		101
+ #define RISCV_ISA_EXT_ZCLSD		102
+ #define RISCV_ISA_EXT_ZICFILP		103
+ #define RISCV_ISA_EXT_ZICFISS		104
++#define RISCV_ISA_EXT_SVRSW60T59B	105
  
  #define RISCV_ISA_EXT_XLINUXENVCFG	127
  

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

linux-next: manual merge of the risc-v tree with the mm-stable tree

[Mark Brown]

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

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

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