Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support page table check PowerPC #804

Closed
wants to merge 1 commit into from
Closed

Conversation

bjoto
Copy link

@bjoto bjoto commented Mar 28, 2024

Pull request for series with
subject: Support page table check PowerPC
version: 11
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=839177

@bjoto
Copy link
Author

bjoto commented Mar 28, 2024

Upstream branch: 653650c
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=839177
version: 11

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-riscv/list/?series=839177
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: Revert "mm/page_table_check: remove unused parameter in [__]page_table_check_pud_set"
Using index info to reconstruct a base tree...
M	arch/riscv/include/asm/pgtable.h
Falling back to patching base and 3-way merge...
Auto-merging arch/riscv/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/riscv/include/asm/pgtable.h
Patch failed at 0001 Revert "mm/page_table_check: remove unused parameter in [__]page_table_check_pud_set"
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc arch/riscv/include/asm/pgtable.h
index 97fcde30e247,1e0c0717b3f9..000000000000
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@@ -721,8 -719,8 +721,13 @@@ static inline void set_pmd_at(struct mm
  static inline void set_pud_at(struct mm_struct *mm, unsigned long addr,
  				pud_t *pudp, pud_t pud)
  {
++<<<<<<< HEAD
 +	page_table_check_pud_set(mm, pudp, pud);
 +	return __set_pte_at(mm, (pte_t *)pudp, pud_pte(pud));
++=======
+ 	page_table_check_pud_set(mm, addr, pudp, pud);
+ 	return __set_pte_at((pte_t *)pudp, pud_pte(pud));
++>>>>>>> Revert "mm/page_table_check: remove unused parameter in [__]page_table_check_pud_set"
  }
  
  #ifdef CONFIG_PAGE_TABLE_CHECK

@bjoto
Copy link
Author

bjoto commented Apr 2, 2024

At least one diff in series https://patchwork.kernel.org/project/linux-riscv/list/?series=840452 irrelevant now. Closing PR.

@bjoto bjoto closed this Apr 2, 2024
@bjoto bjoto deleted the series/834845=>fixes branch April 2, 2024 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant