From: Johan Hovold <johan@kernel.org>
To: Anup Patel <anup@brainfault.org>
Cc: Palmer Dabbelt <palmer@sifive.com>,
Anup Patel <Anup.Patel@wdc.com>,
"linux-kernel@vger.kernel.org List"
<linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@infradead.org>,
Atish Patra <Atish.Patra@wdc.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Paul Walmsley <paul.walmsley@sifive.com>,
linux-riscv@lists.infradead.org
Subject: Re: [PATCH v2 0/6] Fixmap support and MM cleanups
Date: Wed, 13 Feb 2019 10:20:03 +0100 [thread overview]
Message-ID: <20190213092003.GF28278@localhost> (raw)
In-Reply-To: <CAAhSdy25GUFWfkQHBDy6HysVCVFOpv-ZLY6vr+oH34XbqScYFQ@mail.gmail.com>
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
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2019-02-13 9:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-19 13:27 [PATCH v2 0/6] Fixmap support and MM cleanups Anup Patel
2019-01-19 13:27 ` [PATCH v2 1/6] RISC-V: Move free_initrd_mem() to kernel/setup.c Anup Patel
2019-01-19 13:28 ` [PATCH v2 2/6] RISC-V: Setup init_mm before parse_early_param() Anup Patel
2019-02-12 7:05 ` Christoph Hellwig
2019-01-19 13:28 ` [PATCH v2 3/6] RISC-V: Move setup_bootmem() to mm/init.c Anup Patel
2019-01-19 13:28 ` [PATCH v2 4/6] RISC-V: Move setup_vm() " Anup Patel
2019-01-19 13:28 ` [PATCH v2 5/6] RISC-V: Implement compile-time fixed mappings Anup Patel
2019-02-12 7:06 ` Christoph Hellwig
2019-01-19 13:28 ` [PATCH v2 6/6] RISC-V: Implement keepinitrd kernel parameter Anup Patel
2019-02-12 7:08 ` Christoph Hellwig
2019-02-12 10:23 ` Anup Patel
2019-02-12 10:37 ` Andreas Schwab
2019-02-12 13:53 ` Anup Patel
2019-02-12 18:45 ` Christoph Hellwig
2019-02-13 3:43 ` Anup Patel
2019-02-13 5:55 ` Christoph Hellwig
2019-02-13 6:05 ` Anup Patel
2019-02-12 21:59 ` Palmer Dabbelt
2019-02-11 6:27 ` [PATCH v2 0/6] Fixmap support and MM cleanups Anup Patel
2019-02-12 23:15 ` Palmer Dabbelt
2019-02-13 8:21 ` Anup Patel
2019-02-13 9:20 ` Johan Hovold [this message]
2019-02-14 0:37 ` Palmer Dabbelt
2019-02-14 8:28 ` Anup Patel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190213092003.GF28278@localhost \
--to=johan@kernel.org \
--cc=Anup.Patel@wdc.com \
--cc=Atish.Patra@wdc.com \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@sifive.com \
--cc=paul.walmsley@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).