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@xxxxxxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
