linux-riscv.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Samuel Holland <samuel@sholland.org>
To: Palmer Dabbelt <palmer@dabbelt.com>
Cc: heiko@sntech.de, Paul Walmsley <paul.walmsley@sifive.com>,
	linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 0/2] riscv: Add macro for multiple nop instructions
Date: Sun, 24 Jul 2022 12:24:40 -0500	[thread overview]
Message-ID: <d684ed27-2530-4470-a320-80baadbb6197@sholland.org> (raw)
In-Reply-To: <mhng-24b00ffb-dcaa-40b3-8da3-2c2fe26ea3aa@palmer-mbp2014>

Hi Palmer,

On 7/21/22 9:16 PM, Palmer Dabbelt wrote:
> On Tue, 07 Jun 2022 07:30:57 PDT (-0700), heiko@sntech.de wrote:
>> Some cases need multiple nop instructions and arm64 already has a
>> nice helper for not needing to write all of them out but instead
>> use a helper to add n nops.
>>
>> So add a similar thing to riscv and convert the T-Head PMA
>> alternative to use it.
>>
>>
>> Heiko Stuebner (2):
>>   riscv: introduce nops and __nops macros for NOP sequences
>>   riscv: convert the t-head pbmt errata to use the __nops macro
>>
>>  arch/riscv/include/asm/asm.h         | 15 +++++++++++++++
>>  arch/riscv/include/asm/barrier.h     |  2 ++
>>  arch/riscv/include/asm/errata_list.h |  8 +-------
>>  3 files changed, 18 insertions(+), 7 deletions(-)
> 
> Thanks, these are on for-next.  I had to fix up some minor conflicts, but
> hopefuly nothing went wrong.

The conflicts are because the patch was sent on top of fixes, specifically
e83031564137 ("riscv: Fix ALT_THEAD_PMA's asm parameters"). Since you applied
this patch without pulling fixes in to for-next, now for-next conflicts with master.

Regards,
Samuel

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

      reply	other threads:[~2022-07-24 17:25 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-07 14:30 [PATCH 0/2] riscv: Add macro for multiple nop instructions Heiko Stuebner
2022-06-07 14:30 ` [PATCH 1/2] riscv: introduce nops and __nops macros for NOP sequences Heiko Stuebner
2022-06-07 14:30 ` [PATCH 2/2] riscv: convert the t-head pbmt errata to use the __nops macro Heiko Stuebner
2022-06-08  2:28 ` [PATCH 0/2] riscv: Add macro for multiple nop instructions Guo Ren
2022-07-22  2:16 ` Palmer Dabbelt
2022-07-24 17:24   ` Samuel Holland [this message]

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=d684ed27-2530-4470-a320-80baadbb6197@sholland.org \
    --to=samuel@sholland.org \
    --cc=heiko@sntech.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=palmer@dabbelt.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).