From: Thomas Petazzoni via buildroot <buildroot@buildroot.org>
To: Pedro Aguilar <paguilar@paguilar.org>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/bdwgc: bump to version 8.2.6
Date: Sat, 14 Sep 2024 09:33:12 +0200 [thread overview]
Message-ID: <20240914093312.56e4e7cd@windsurf> (raw)
In-Reply-To: <20240913210301.6681-1-paguilar@paguilar.org>
On Fri, 13 Sep 2024 23:03:01 +0200
Pedro Aguilar <paguilar@paguilar.org> wrote:
> Signed-off-by: Pedro Aguilar <paguilar@paguilar.org>
> ---
> package/bdwgc/bdwgc.hash | 4 ++++
> package/bdwgc/bdwgc.mk | 4 ++++
> 2 files changed, 8 insertions(+)
>
> diff --git a/package/bdwgc/bdwgc.hash b/package/bdwgc/bdwgc.hash
> index 917089da08..1e8cc6df98 100644
> --- a/package/bdwgc/bdwgc.hash
> +++ b/package/bdwgc/bdwgc.hash
> @@ -1,3 +1,7 @@
> # Locally computed
> +<<<<<<< Updated upstream
> sha256 f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0 gc-8.2.2.tar.gz
> +=======
> +sha256 b9183fe49d4c44c7327992f626f8eaa1d8b14de140f243edb1c9dcff7719a7fc gc-8.2.6.tar.gz
> +>>>>>>> Stashed changes
Well... your patch has issue it seems :-)
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
prev parent reply other threads:[~2024-09-14 7:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-13 21:03 [Buildroot] [PATCH 1/1] package/bdwgc: bump to version 8.2.6 Pedro Aguilar
2024-09-14 7:33 ` Thomas Petazzoni via buildroot [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=20240914093312.56e4e7cd@windsurf \
--to=buildroot@buildroot.org \
--cc=paguilar@paguilar.org \
--cc=thomas.petazzoni@bootlin.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.