Messages in this thread | | | Date | Wed, 13 Feb 2019 10:20:03 +0100 | From | Johan Hovold <> | Subject | Re: [PATCH v2 0/6] Fixmap support and MM cleanups |
| |
On Wed, Feb 13, 2019 at 01:51:43PM +0530, Anup Patel wrote: > On Wed, Feb 13, 2019 at 4:45 AM Palmer Dabbelt <palmer@sifive.com> wrote: > > > > On Sat, 19 Jan 2019 05:27:53 PST (-0800), Anup Patel wrote: > > > This patchset does: > > > 1. Moves MM related code from kernel/setup.c to mm/init.c > > > 2. Implements compile-time fixed mappings
> > > arch/riscv/Kconfig | 3 + > > > arch/riscv/include/asm/fixmap.h | 44 +++++++++++ > > > arch/riscv/include/asm/pgtable.h | 1 + > > > arch/riscv/kernel/setup.c | 114 ++++++---------------------- > > > arch/riscv/mm/init.c | 124 ++++++++++++++++++++++++++++++- > > > 5 files changed, 189 insertions(+), 97 deletions(-) > > > create mode 100644 arch/riscv/include/asm/fixmap.h > > > > I'm getting some git issue when trying to merge the third patch via email > > > > $ mhng-pipe-show_stdout 4 | git am -s > > Applying: RISC-V: Move setup_bootmem() to mm/init.c > > error: patch failed: arch/riscv/kernel/setup.c:163 > > error: arch/riscv/kernel/setup.c: patch does not apply > > Patch failed at 0001 RISC-V: Move setup_bootmem() to mm/init.c > > Use 'git am --show-current-patch' to see the failed patch > > 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". > > > > can you send a PR with a signed tag? I'll include this as part of the next > > merge window. > > > > Reviewed-by: Palmer Dabbelt <palmer@sifive.com> > > Okay, I will prepare a PR with following patchsets: > 1. Fixmap support and MM cleanups (Author: Anup Patel) > 2. riscv: minor fixes and cleanups (Author: Johan Hovold) > 3. RISC-V related changes from "Various SMP related fixes" (Author: Atish Patra) > > All above patchsets touch same source files so this will > help you.
I'd suggest keeping these separate. Your series failed to apply, and it looks like you've now posted a v4 to address that.
If your series is merged before mine, I'm sure any conflicts are trivial, or I can always respin.
Atish's series might need another revision, so that one should not be included either.
Johan
| |