mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/3] sandbox: fix link error when UBSAN is selected without ASAN
Date: Mon, 19 Oct 2020 09:58:56 +0200	[thread overview]
Message-ID: <20201019075856.GN13710@pengutronix.de> (raw)
In-Reply-To: <20201015090055.31130-1-a.fatoum@pengutronix.de>

On Thu, Oct 15, 2020 at 11:00:54AM +0200, Ahmad Fatoum wrote:
> dc7f1fce6747 ("sandbox: fix SANDBOX_UNWIND dependency to be KASAN
> only") already restricted ARCH_HAS_STACK_DUMP to be dependent
> only on AddressSanitizer being available.
> 
> This change got lost by an erroneous merge conflict resolution in
> 39bdcdfb814a ("Merge branch 'for-next/misc' into master"). Fix it up.
> 
> Fixes: 39bdcdfb814a ("Merge branch 'for-next/misc' into master")
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  arch/sandbox/Kconfig | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)

Applied this one to master and the other two for next.

Sascha


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2020-10-19  7:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-15  9:00 Ahmad Fatoum
2020-10-15  9:00 ` [PATCH 2/3] kbuild: force compiler to assume two's complement Ahmad Fatoum
2020-10-15  9:00 ` [PATCH 3/3] Revert "common: ubsan: ignore shifting one into sign bit" Ahmad Fatoum
2020-10-19  7:58 ` Sascha Hauer [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=20201019075856.GN13710@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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