Skip to contentSkip to conversation

linux-next: manual merge of the loongarch tree with the origin tree

PATCH Mark Brown 1 participant 1 message Apr 22

Subsystems (2)
Linux-next tree LoongArch
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

Hi all,

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

arch/loongarch/mm/init.c

between commit:

6215d9f4470fb ("arch, mm: consolidate empty_zero_page")

from the origin tree and commit:

8b81576c16c06 ("LoongArch: Add HIGHMEM (PKMAP and FIX_KMAP) support")

from the loongarch 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.

arch/loongarch/mm/init.c +0 -0
diff --cc arch/loongarch/mm/init.c
index 00f3822b6e47c,bf51f4a1b086e..0000000000000
@@@ -36,20 -36,9 +36,6 @@@
  #include <asm/pgalloc.h>
  #include <asm/tlb.h>
  
- void copy_user_highpage(struct page *to, struct page *from,
- 	unsigned long vaddr, struct vm_area_struct *vma)
- {
- 	void *vfrom, *vto;
- 
- 	vfrom = kmap_local_page(from);
- 	vto = kmap_local_page(to);
- 	copy_page(vto, vfrom);
- 	kunmap_local(vfrom);
- 	kunmap_local(vto);
- 	/* Make sure this page is cleared on other CPU's too before using it */
- 	smp_wmb();
- }
 -unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss;
 -EXPORT_SYMBOL(empty_zero_page);
--
  int __ref page_is_ram(unsigned long pfn)
  {
  	unsigned long addr = PFN_PHYS(pfn);